diff --git a/pokedex/data/csv/pokemon_forms.csv b/pokedex/data/csv/pokemon_forms.csv
index 27a78ef..25433f9 100644
--- a/pokedex/data/csv/pokemon_forms.csv
+++ b/pokedex/data/csv/pokemon_forms.csv
@@ -411,54 +411,54 @@ id,form_identifier,pokemon_id,introduced_in_version_group_id,is_default,is_battl
 410,,410,8,1,0,1,470
 411,,411,8,1,0,1,471
 412,plant,412,8,1,0,1,472
-413,plant,413,8,1,0,1,473
-414,,414,8,1,0,1,476
-415,,415,8,1,0,1,477
-416,,416,8,1,0,1,478
-417,,417,8,1,0,1,479
-418,,418,8,1,0,1,480
-419,,419,8,1,0,1,481
-420,,420,8,1,0,1,482
-421,overcast,421,8,1,0,1,483
-422,west,422,8,1,0,1,484
-423,west,423,8,1,0,1,485
+413,plant,413,8,1,0,1,475
+414,,414,8,1,0,1,478
+415,,415,8,1,0,1,479
+416,,416,8,1,0,1,480
+417,,417,8,1,0,1,481
+418,,418,8,1,0,1,482
+419,,419,8,1,0,1,483
+420,,420,8,1,0,1,484
+421,overcast,421,8,1,0,1,485
+422,west,422,8,1,0,1,487
+423,west,423,8,1,0,1,489
 424,,424,8,1,0,1,220
-425,,425,8,1,0,1,486
-426,,426,8,1,0,1,487
-427,,427,8,1,0,1,488
-428,,428,8,1,0,1,489
+425,,425,8,1,0,1,491
+426,,426,8,1,0,1,492
+427,,427,8,1,0,1,493
+428,,428,8,1,0,1,494
 429,,429,8,1,0,1,230
 430,,430,8,1,0,1,228
-431,,431,8,1,0,1,490
-432,,432,8,1,0,1,491
+431,,431,8,1,0,1,495
+432,,432,8,1,0,1,496
 433,,433,8,1,0,1,416
-434,,434,8,1,0,1,492
-435,,435,8,1,0,1,493
-436,,436,8,1,0,1,494
-437,,437,8,1,0,1,495
+434,,434,8,1,0,1,497
+435,,435,8,1,0,1,498
+436,,436,8,1,0,1,499
+437,,437,8,1,0,1,500
 438,,438,8,1,0,1,214
 439,,439,8,1,0,1,140
 440,,440,8,1,0,1,127
-441,,441,8,1,0,1,496
-442,,442,8,1,0,1,497
-443,,443,8,1,0,1,498
-444,,444,8,1,0,1,499
-445,,445,8,1,0,1,500
+441,,441,8,1,0,1,501
+442,,442,8,1,0,1,502
+443,,443,8,1,0,1,503
+444,,444,8,1,0,1,504
+445,,445,8,1,0,1,505
 446,,446,8,1,0,1,174
-447,,447,8,1,0,1,501
-448,,448,8,1,0,1,502
-449,,449,8,1,0,1,503
-450,,450,8,1,0,1,504
-451,,451,8,1,0,1,505
-452,,452,8,1,0,1,506
-453,,453,8,1,0,1,507
-454,,454,8,1,0,1,508
-455,,455,8,1,0,1,509
-456,,456,8,1,0,1,510
-457,,457,8,1,0,1,511
+447,,447,8,1,0,1,506
+448,,448,8,1,0,1,507
+449,,449,8,1,0,1,508
+450,,450,8,1,0,1,509
+451,,451,8,1,0,1,510
+452,,452,8,1,0,1,511
+453,,453,8,1,0,1,512
+454,,454,8,1,0,1,513
+455,,455,8,1,0,1,514
+456,,456,8,1,0,1,515
+457,,457,8,1,0,1,516
 458,,458,8,1,0,1,284
-459,,459,8,1,0,1,512
-460,,460,8,1,0,1,513
+459,,459,8,1,0,1,517
+460,,460,8,1,0,1,518
 461,,461,8,1,0,1,272
 462,,462,8,1,0,1,91
 463,,463,8,1,0,1,121
@@ -477,177 +477,177 @@ id,form_identifier,pokemon_id,introduced_in_version_group_id,is_default,is_battl
 476,,476,8,1,0,1,351
 477,,477,8,1,0,1,414
 478,,478,8,1,0,1,421
-479,,479,8,1,0,1,514
-480,,480,8,1,0,1,520
-481,,481,8,1,0,1,521
-482,,482,8,1,0,1,522
-483,,483,8,1,0,1,523
-484,,484,8,1,0,1,524
-485,,485,8,1,0,1,525
-486,,486,8,1,0,1,526
-487,altered,487,8,1,0,1,527
-488,,488,8,1,0,1,529
-489,,489,8,1,0,1,530
-490,,490,8,1,0,1,531
-491,,491,8,1,0,1,532
-492,land,492,8,1,0,1,533
-493,normal,493,8,1,0,1,535
-494,,494,11,1,0,1,536
-495,,495,11,1,0,1,537
-496,,496,11,1,0,1,538
-497,,497,11,1,0,1,539
-498,,498,11,1,0,1,540
-499,,499,11,1,0,1,541
-500,,500,11,1,0,1,542
-501,,501,11,1,0,1,543
-502,,502,11,1,0,1,544
-503,,503,11,1,0,1,545
-504,,504,11,1,0,1,546
-505,,505,11,1,0,1,547
-506,,506,11,1,0,1,548
-507,,507,11,1,0,1,549
-508,,508,11,1,0,1,550
-509,,509,11,1,0,1,551
-510,,510,11,1,0,1,552
-511,,511,11,1,0,1,553
-512,,512,11,1,0,1,554
-513,,513,11,1,0,1,555
-514,,514,11,1,0,1,556
-515,,515,11,1,0,1,557
-516,,516,11,1,0,1,558
-517,,517,11,1,0,1,559
-518,,518,11,1,0,1,560
-519,,519,11,1,0,1,561
-520,,520,11,1,0,1,562
-521,,521,11,1,0,1,563
-522,,522,11,1,0,1,564
-523,,523,11,1,0,1,565
-524,,524,11,1,0,1,566
-525,,525,11,1,0,1,567
-526,,526,11,1,0,1,568
-527,,527,11,1,0,1,569
-528,,528,11,1,0,1,570
-529,,529,11,1,0,1,571
-530,,530,11,1,0,1,572
-531,,531,11,1,0,1,573
-532,,532,11,1,0,1,574
-533,,533,11,1,0,1,575
-534,,534,11,1,0,1,576
-535,,535,11,1,0,1,577
-536,,536,11,1,0,1,578
-537,,537,11,1,0,1,579
-538,,538,11,1,0,1,580
-539,,539,11,1,0,1,581
-540,,540,11,1,0,1,582
-541,,541,11,1,0,1,583
-542,,542,11,1,0,1,584
-543,,543,11,1,0,1,585
-544,,544,11,1,0,1,586
-545,,545,11,1,0,1,587
-546,,546,11,1,0,1,588
-547,,547,11,1,0,1,589
-548,,548,11,1,0,1,590
-549,,549,11,1,0,1,591
-550,red-striped,550,11,1,0,1,592
-551,,551,11,1,0,1,594
-552,,552,11,1,0,1,595
-553,,553,11,1,0,1,596
-554,,554,11,1,0,1,597
-555,standard,555,11,1,0,1,598
-556,,556,11,1,0,1,600
-557,,557,11,1,0,1,601
-558,,558,11,1,0,1,602
-559,,559,11,1,0,1,603
-560,,560,11,1,0,1,604
-561,,561,11,1,0,1,605
-562,,562,11,1,0,1,606
-563,,563,11,1,0,1,607
-564,,564,11,1,0,1,608
-565,,565,11,1,0,1,609
-566,,566,11,1,0,1,610
-567,,567,11,1,0,1,611
-568,,568,11,1,0,1,612
-569,,569,11,1,0,1,613
-570,,570,11,1,0,1,614
-571,,571,11,1,0,1,615
-572,,572,11,1,0,1,616
-573,,573,11,1,0,1,617
-574,,574,11,1,0,1,618
-575,,575,11,1,0,1,619
-576,,576,11,1,0,1,620
-577,,577,11,1,0,1,621
-578,,578,11,1,0,1,622
-579,,579,11,1,0,1,623
-580,,580,11,1,0,1,624
-581,,581,11,1,0,1,625
-582,,582,11,1,0,1,626
-583,,583,11,1,0,1,627
-584,,584,11,1,0,1,628
-585,spring,585,11,1,0,1,629
-586,spring,586,11,1,0,1,630
-587,,587,11,1,0,1,631
-588,,588,11,1,0,1,632
-589,,589,11,1,0,1,633
-590,,590,11,1,0,1,634
-591,,591,11,1,0,1,635
-592,,592,11,1,0,1,636
-593,,593,11,1,0,1,637
-594,,594,11,1,0,1,638
-595,,595,11,1,0,1,639
-596,,596,11,1,0,1,640
-597,,597,11,1,0,1,641
-598,,598,11,1,0,1,642
-599,,599,11,1,0,1,643
-600,,600,11,1,0,1,644
-601,,601,11,1,0,1,645
-602,,602,11,1,0,1,646
-603,,603,11,1,0,1,647
-604,,604,11,1,0,1,648
-605,,605,11,1,0,1,649
-606,,606,11,1,0,1,650
-607,,607,11,1,0,1,651
-608,,608,11,1,0,1,652
-609,,609,11,1,0,1,653
-610,,610,11,1,0,1,654
-611,,611,11,1,0,1,655
-612,,612,11,1,0,1,656
-613,,613,11,1,0,1,657
-614,,614,11,1,0,1,658
-615,,615,11,1,0,1,659
-616,,616,11,1,0,1,660
-617,,617,11,1,0,1,661
-618,,618,11,1,0,1,662
-619,,619,11,1,0,1,663
-620,,620,11,1,0,1,664
-621,,621,11,1,0,1,665
-622,,622,11,1,0,1,666
-623,,623,11,1,0,1,667
-624,,624,11,1,0,1,668
-625,,625,11,1,0,1,669
-626,,626,11,1,0,1,670
-627,,627,11,1,0,1,671
-628,,628,11,1,0,1,672
-629,,629,11,1,0,1,673
-630,,630,11,1,0,1,674
-631,,631,11,1,0,1,675
-632,,632,11,1,0,1,676
-633,,633,11,1,0,1,677
-634,,634,11,1,0,1,678
-635,,635,11,1,0,1,679
-636,,636,11,1,0,1,680
-637,,637,11,1,0,1,681
-638,,638,11,1,0,1,682
-639,,639,11,1,0,1,683
-640,,640,11,1,0,1,684
-641,,641,11,1,0,1,685
-642,,642,11,1,0,1,686
-643,,643,11,1,0,1,687
-644,,644,11,1,0,1,688
-645,,645,11,1,0,1,689
-646,,646,11,1,0,1,690
-647,,647,11,1,0,1,691
-648,aria,648,11,1,0,1,692
-649,,649,11,1,0,1,694
+479,,479,8,1,0,1,519
+480,,480,8,1,0,1,525
+481,,481,8,1,0,1,526
+482,,482,8,1,0,1,527
+483,,483,8,1,0,1,528
+484,,484,8,1,0,1,529
+485,,485,8,1,0,1,530
+486,,486,8,1,0,1,531
+487,altered,487,8,1,0,1,532
+488,,488,8,1,0,1,534
+489,,489,8,1,0,1,535
+490,,490,8,1,0,1,536
+491,,491,8,1,0,1,537
+492,land,492,8,1,0,1,538
+493,normal,493,8,1,0,1,540
+494,,494,11,1,0,1,543
+495,,495,11,1,0,1,544
+496,,496,11,1,0,1,545
+497,,497,11,1,0,1,546
+498,,498,11,1,0,1,547
+499,,499,11,1,0,1,548
+500,,500,11,1,0,1,549
+501,,501,11,1,0,1,550
+502,,502,11,1,0,1,551
+503,,503,11,1,0,1,552
+504,,504,11,1,0,1,553
+505,,505,11,1,0,1,554
+506,,506,11,1,0,1,555
+507,,507,11,1,0,1,556
+508,,508,11,1,0,1,557
+509,,509,11,1,0,1,558
+510,,510,11,1,0,1,559
+511,,511,11,1,0,1,560
+512,,512,11,1,0,1,561
+513,,513,11,1,0,1,562
+514,,514,11,1,0,1,563
+515,,515,11,1,0,1,564
+516,,516,11,1,0,1,565
+517,,517,11,1,0,1,566
+518,,518,11,1,0,1,567
+519,,519,11,1,0,1,568
+520,,520,11,1,0,1,569
+521,,521,11,1,0,1,570
+522,,522,11,1,0,1,571
+523,,523,11,1,0,1,572
+524,,524,11,1,0,1,573
+525,,525,11,1,0,1,574
+526,,526,11,1,0,1,575
+527,,527,11,1,0,1,576
+528,,528,11,1,0,1,577
+529,,529,11,1,0,1,578
+530,,530,11,1,0,1,579
+531,,531,11,1,0,1,580
+532,,532,11,1,0,1,581
+533,,533,11,1,0,1,582
+534,,534,11,1,0,1,583
+535,,535,11,1,0,1,584
+536,,536,11,1,0,1,585
+537,,537,11,1,0,1,586
+538,,538,11,1,0,1,587
+539,,539,11,1,0,1,588
+540,,540,11,1,0,1,589
+541,,541,11,1,0,1,590
+542,,542,11,1,0,1,591
+543,,543,11,1,0,1,592
+544,,544,11,1,0,1,593
+545,,545,11,1,0,1,594
+546,,546,11,1,0,1,595
+547,,547,11,1,0,1,596
+548,,548,11,1,0,1,597
+549,,549,11,1,0,1,598
+550,red-striped,550,11,1,0,1,599
+551,,551,11,1,0,1,601
+552,,552,11,1,0,1,602
+553,,553,11,1,0,1,603
+554,,554,11,1,0,1,604
+555,standard,555,11,1,0,1,605
+556,,556,11,1,0,1,607
+557,,557,11,1,0,1,608
+558,,558,11,1,0,1,609
+559,,559,11,1,0,1,610
+560,,560,11,1,0,1,611
+561,,561,11,1,0,1,612
+562,,562,11,1,0,1,613
+563,,563,11,1,0,1,614
+564,,564,11,1,0,1,615
+565,,565,11,1,0,1,616
+566,,566,11,1,0,1,617
+567,,567,11,1,0,1,618
+568,,568,11,1,0,1,619
+569,,569,11,1,0,1,620
+570,,570,11,1,0,1,621
+571,,571,11,1,0,1,622
+572,,572,11,1,0,1,623
+573,,573,11,1,0,1,624
+574,,574,11,1,0,1,625
+575,,575,11,1,0,1,626
+576,,576,11,1,0,1,627
+577,,577,11,1,0,1,628
+578,,578,11,1,0,1,629
+579,,579,11,1,0,1,630
+580,,580,11,1,0,1,631
+581,,581,11,1,0,1,632
+582,,582,11,1,0,1,633
+583,,583,11,1,0,1,634
+584,,584,11,1,0,1,635
+585,spring,585,11,1,0,1,636
+586,spring,586,11,1,0,1,640
+587,,587,11,1,0,1,644
+588,,588,11,1,0,1,645
+589,,589,11,1,0,1,646
+590,,590,11,1,0,1,647
+591,,591,11,1,0,1,648
+592,,592,11,1,0,1,649
+593,,593,11,1,0,1,650
+594,,594,11,1,0,1,651
+595,,595,11,1,0,1,652
+596,,596,11,1,0,1,653
+597,,597,11,1,0,1,654
+598,,598,11,1,0,1,655
+599,,599,11,1,0,1,656
+600,,600,11,1,0,1,657
+601,,601,11,1,0,1,658
+602,,602,11,1,0,1,659
+603,,603,11,1,0,1,660
+604,,604,11,1,0,1,661
+605,,605,11,1,0,1,662
+606,,606,11,1,0,1,663
+607,,607,11,1,0,1,664
+608,,608,11,1,0,1,665
+609,,609,11,1,0,1,666
+610,,610,11,1,0,1,667
+611,,611,11,1,0,1,668
+612,,612,11,1,0,1,669
+613,,613,11,1,0,1,670
+614,,614,11,1,0,1,671
+615,,615,11,1,0,1,672
+616,,616,11,1,0,1,673
+617,,617,11,1,0,1,674
+618,,618,11,1,0,1,675
+619,,619,11,1,0,1,676
+620,,620,11,1,0,1,677
+621,,621,11,1,0,1,678
+622,,622,11,1,0,1,679
+623,,623,11,1,0,1,680
+624,,624,11,1,0,1,681
+625,,625,11,1,0,1,682
+626,,626,11,1,0,1,683
+627,,627,11,1,0,1,684
+628,,628,11,1,0,1,685
+629,,629,11,1,0,1,686
+630,,630,11,1,0,1,687
+631,,631,11,1,0,1,688
+632,,632,11,1,0,1,689
+633,,633,11,1,0,1,690
+634,,634,11,1,0,1,691
+635,,635,11,1,0,1,692
+636,,636,11,1,0,1,693
+637,,637,11,1,0,1,694
+638,,638,11,1,0,1,695
+639,,639,11,1,0,1,696
+640,,640,11,1,0,1,697
+641,,641,11,1,0,1,698
+642,,642,11,1,0,1,699
+643,,643,11,1,0,1,700
+644,,644,11,1,0,1,701
+645,,645,11,1,0,1,702
+646,,646,11,1,0,1,703
+647,,647,11,1,0,1,704
+648,aria,648,11,1,0,1,705
+649,,649,11,1,0,1,707
 650,b,201,3,0,0,2,232
 651,c,201,3,0,0,3,233
 652,d,201,3,0,0,4,234
@@ -681,48 +681,48 @@ id,form_identifier,pokemon_id,introduced_in_version_group_id,is_default,is_battl
 680,attack,650,7,1,0,2,446
 681,defense,651,7,1,0,3,447
 682,speed,652,6,1,0,4,448
-683,sandy,412,8,0,0,2,472
-684,trash,412,8,0,0,3,472
-685,sandy,653,8,1,0,2,474
-686,trash,654,8,1,0,3,475
-687,sunshine,421,8,0,1,2,483
-688,east,422,8,0,0,2,484
-689,east,423,8,0,0,2,485
-690,bug,493,8,0,0,2,535
-691,dark,493,8,0,0,2,535
-692,dragon,493,8,0,0,2,535
-693,electric,493,8,0,0,2,535
-694,fighting,493,8,0,0,2,535
-695,fire,493,8,0,0,2,535
-696,flying,493,8,0,0,2,535
-697,ghost,493,8,0,0,2,535
-698,grass,493,8,0,0,2,535
-699,ground,493,8,0,0,2,535
-700,ice,493,8,0,0,2,535
-701,poison,493,8,0,0,2,535
-702,psychic,493,8,0,0,2,535
-703,rock,493,8,0,0,2,535
-704,steel,493,8,0,0,2,535
-705,water,493,8,0,0,2,535
-706,unknown,493,8,0,0,3,535
-707,heat,657,9,1,0,2,515
-708,wash,658,9,1,0,3,516
-709,frost,659,9,1,0,4,517
-710,fan,660,9,1,0,5,518
-711,mow,661,9,1,0,6,519
-712,origin,656,9,1,0,2,528
-713,sky,655,9,1,0,2,534
+683,sandy,412,8,0,0,2,473
+684,trash,412,8,0,0,3,474
+685,sandy,653,8,1,0,2,476
+686,trash,654,8,1,0,3,477
+687,sunshine,421,8,0,1,2,486
+688,east,422,8,0,0,2,488
+689,east,423,8,0,0,2,490
+690,bug,493,8,0,0,2,541
+691,dark,493,8,0,0,2,541
+692,dragon,493,8,0,0,2,541
+693,electric,493,8,0,0,2,541
+694,fighting,493,8,0,0,2,541
+695,fire,493,8,0,0,2,541
+696,flying,493,8,0,0,2,541
+697,ghost,493,8,0,0,2,541
+698,grass,493,8,0,0,2,541
+699,ground,493,8,0,0,2,541
+700,ice,493,8,0,0,2,541
+701,poison,493,8,0,0,2,541
+702,psychic,493,8,0,0,2,541
+703,rock,493,8,0,0,2,541
+704,steel,493,8,0,0,2,541
+705,water,493,8,0,0,2,541
+706,unknown,493,8,0,0,3,542
+707,heat,657,9,1,0,2,520
+708,wash,658,9,1,0,3,521
+709,frost,659,9,1,0,4,522
+710,fan,660,9,1,0,5,523
+711,mow,661,9,1,0,6,524
+712,origin,656,9,1,0,2,533
+713,sky,655,9,1,0,2,539
 714,spiky-eared,172,10,0,0,2,26
-715,blue-striped,665,11,1,0,2,593
-716,zen,666,11,1,1,2,599
-717,summer,585,11,0,0,2,629
-718,autumn,585,11,0,0,3,629
-719,winter,585,11,0,0,4,629
-720,summer,586,11,0,0,2,630
-721,autumn,586,11,0,0,3,630
-722,winter,586,11,0,0,4,630
-723,pirouette,667,11,1,1,2,693
-724,douse,649,11,0,0,2,694
-725,shock,649,11,0,0,2,694
-726,burn,649,11,0,0,2,694
-727,chill,649,11,0,0,2,694
+715,blue-striped,665,11,1,0,2,600
+716,zen,666,11,1,1,2,606
+717,summer,585,11,0,0,2,637
+718,autumn,585,11,0,0,3,638
+719,winter,585,11,0,0,4,639
+720,summer,586,11,0,0,2,641
+721,autumn,586,11,0,0,3,642
+722,winter,586,11,0,0,4,643
+723,pirouette,667,11,1,1,2,706
+724,douse,649,11,0,0,2,708
+725,shock,649,11,0,0,2,708
+726,burn,649,11,0,0,2,708
+727,chill,649,11,0,0,2,708