diff --git a/pokedex/data/csv/pokemon.csv b/pokedex/data/csv/pokemon.csv
index 18e04bf..cdc7517 100644
--- a/pokedex/data/csv/pokemon.csv
+++ b/pokedex/data/csv/pokemon.csv
@@ -1,668 +1,668 @@
-id,species_id,height,weight,base_experience,order
-1,1,7,69,64,1
-2,2,10,130,141,2
-3,3,20,1000,208,3
-4,4,6,85,65,4
-5,5,11,190,142,5
-6,6,17,905,209,6
-7,7,5,90,66,7
-8,8,10,225,143,8
-9,9,16,855,210,9
-10,10,3,29,53,10
-11,11,7,99,72,11
-12,12,11,320,160,12
-13,13,3,32,52,13
-14,14,6,100,71,14
-15,15,10,295,159,15
-16,16,3,18,55,16
-17,17,11,300,113,17
-18,18,15,395,172,18
-19,19,3,35,57,19
-20,20,7,185,116,20
-21,21,3,20,58,21
-22,22,12,380,162,22
-23,23,20,69,62,23
-24,24,35,650,147,24
-25,25,4,60,82,26
-26,26,8,300,122,27
-27,27,6,120,93,28
-28,28,10,295,163,29
-29,29,4,70,59,30
-30,30,8,200,117,31
-31,31,13,600,194,32
-32,32,5,90,60,33
-33,33,9,195,118,34
-34,34,14,620,195,35
-35,35,6,75,68,37
-36,36,13,400,129,38
-37,37,6,99,63,39
-38,38,11,199,178,40
-39,39,5,55,76,42
-40,40,10,120,109,43
-41,41,8,75,54,44
-42,42,16,550,171,45
-43,43,5,54,78,47
-44,44,8,86,132,48
-45,45,12,186,184,49
-46,46,3,54,70,51
-47,47,10,295,128,52
-48,48,10,300,75,53
-49,49,15,125,138,54
-50,50,2,8,81,55
-51,51,7,333,153,56
-52,52,4,42,69,57
-53,53,10,320,148,58
-54,54,8,196,80,59
-55,55,17,766,174,60
-56,56,5,280,74,61
-57,57,10,320,149,62
-58,58,7,190,91,63
-59,59,19,1550,213,64
-60,60,6,124,77,65
-61,61,10,200,131,66
-62,62,13,540,185,67
-63,63,9,195,75,69
-64,64,13,565,145,70
-65,65,15,480,186,71
-66,66,8,195,75,72
-67,67,15,705,146,73
-68,68,16,1300,193,74
-69,69,7,40,84,75
-70,70,10,64,151,76
-71,71,17,155,191,77
-72,72,9,455,105,78
-73,73,16,550,205,79
-74,74,4,200,73,80
-75,75,10,1050,134,81
-76,76,14,3000,177,82
-77,77,10,300,152,83
-78,78,17,950,192,84
-79,79,12,360,99,85
-80,80,16,785,164,86
-81,81,3,60,89,88
-82,82,10,600,161,89
-83,83,8,150,94,91
-84,84,14,392,96,92
-85,85,18,852,158,93
-86,86,11,900,100,94
-87,87,17,1200,176,95
-88,88,9,300,90,96
-89,89,12,300,157,97
-90,90,3,40,97,98
-91,91,15,1325,203,99
-92,92,13,1,95,100
-93,93,16,1,126,101
-94,94,15,405,190,102
-95,95,88,2100,108,103
-96,96,10,324,102,105
-97,97,16,756,165,106
-98,98,4,65,115,107
-99,99,13,600,206,108
-100,100,5,104,103,109
-101,101,12,666,150,110
-102,102,4,25,98,111
-103,103,20,1200,212,112
-104,104,4,65,87,113
-105,105,10,450,124,114
-106,106,15,498,139,116
-107,107,14,502,140,117
-108,108,12,655,127,119
-109,109,6,10,114,121
-110,110,12,95,173,122
-111,111,10,1150,135,123
-112,112,19,1200,204,124
-113,113,11,346,255,127
-114,114,10,350,166,129
-115,115,22,800,175,131
-116,116,4,80,83,132
-117,117,12,250,155,133
-118,118,6,150,111,135
-119,119,13,390,170,136
-120,120,8,345,106,137
-121,121,11,800,207,138
-122,122,13,545,136,140
-123,123,15,560,187,141
-124,124,14,406,137,144
-125,125,11,300,156,146
-126,126,13,445,167,149
-127,127,15,550,200,151
-128,128,14,884,211,152
-129,129,9,100,20,153
-130,130,65,2350,214,154
-131,131,25,2200,219,155
-132,132,3,40,61,156
-133,133,3,65,92,157
-134,134,10,290,196,158
-135,135,8,245,197,159
-136,136,9,250,198,160
-137,137,8,365,130,165
-138,138,4,75,99,168
-139,139,10,350,199,169
-140,140,5,115,99,170
-141,141,13,405,199,171
-142,142,18,590,202,172
-143,143,21,4600,154,174
-144,144,17,554,215,175
-145,145,16,526,216,176
-146,146,20,600,217,177
-147,147,18,33,67,178
-148,148,40,165,144,179
-149,149,22,2100,218,180
-150,150,20,1220,220,181
-151,151,4,40,64,182
-152,152,9,64,64,183
-153,153,12,158,141,184
-154,154,18,1005,208,185
-155,155,5,79,65,186
-156,156,9,190,142,187
-157,157,17,795,209,188
-158,158,6,95,66,189
-159,159,11,250,143,190
-160,160,23,888,210,191
-161,161,8,60,57,192
-162,162,18,325,116,193
-163,163,7,212,58,194
-164,164,16,408,162,195
-165,165,10,108,54,196
-166,166,14,356,134,197
-167,167,5,85,54,198
-168,168,11,335,134,199
-169,169,18,750,204,46
-170,170,5,120,90,200
-171,171,12,225,156,201
-172,172,3,20,42,25
-173,173,3,30,37,36
-174,174,3,10,39,41
-175,175,3,15,74,202
-176,176,6,32,114,203
-177,177,2,20,73,205
-178,178,15,150,171,206
-179,179,6,78,59,207
-180,180,8,133,117,208
-181,181,14,615,194,209
-182,182,4,58,184,50
-183,183,4,85,58,211
-184,184,8,285,153,212
-185,185,12,380,135,214
-186,186,11,339,185,68
-187,187,4,5,74,215
-188,188,6,10,136,216
-189,189,8,30,176,217
-190,190,8,115,94,218
-191,191,3,18,52,220
-192,192,8,85,146,221
-193,193,12,380,147,222
-194,194,4,85,52,224
-195,195,14,750,137,225
-196,196,9,265,197,161
-197,197,10,270,197,162
-198,198,5,21,107,226
-199,199,20,795,164,87
-200,200,7,10,147,228
-201,201,5,50,61,230
-202,202,13,285,177,232
-203,203,15,415,149,233
-204,204,6,72,60,234
-205,205,12,1258,118,235
-206,206,15,140,125,236
-207,207,11,648,108,237
-208,208,92,4000,196,104
-209,209,6,78,63,239
-210,210,14,487,178,240
-211,211,5,39,100,241
-212,212,18,1180,200,142
-213,213,6,205,80,242
-214,214,15,540,200,243
-215,215,9,280,132,244
-216,216,6,88,124,246
-217,217,18,1258,189,247
-218,218,7,350,78,248
-219,219,8,550,154,249
-220,220,4,65,78,250
-221,221,11,558,160,251
-222,222,6,50,113,253
-223,223,6,120,78,254
-224,224,9,285,164,255
-225,225,9,160,183,256
-226,226,21,2200,168,258
-227,227,17,505,168,259
-228,228,6,108,114,260
-229,229,14,350,204,261
-230,230,18,1520,207,134
-231,231,5,335,124,262
-232,232,11,1200,189,263
-233,233,6,325,180,166
-234,234,14,712,165,264
-235,235,12,580,106,265
-236,236,7,210,91,115
-237,237,14,480,138,118
-238,238,4,60,87,143
-239,239,6,235,106,145
-240,240,7,214,117,148
-241,241,12,755,200,266
-242,242,15,468,255,128
-243,243,19,1780,216,267
-244,244,21,1980,217,268
-245,245,20,1870,215,269
-246,246,6,720,67,270
-247,247,12,1520,144,271
-248,248,20,2020,218,272
-249,249,52,2160,220,273
-250,250,38,1990,220,274
-251,251,6,50,64,275
-252,252,5,50,65,276
-253,253,9,216,141,277
-254,254,17,522,208,278
-255,255,4,25,65,279
-256,256,9,195,142,280
-257,257,19,520,209,281
-258,258,4,76,65,282
-259,259,7,280,143,283
-260,260,15,819,210,284
-261,261,5,136,55,285
-262,262,10,370,128,286
-263,263,4,175,60,287
-264,264,5,325,128,288
-265,265,3,36,54,289
-266,266,6,100,72,290
-267,267,10,284,161,291
-268,268,7,115,72,292
-269,269,12,316,161,293
-270,270,5,26,74,294
-271,271,12,325,141,295
-272,272,15,550,181,296
-273,273,5,40,74,297
-274,274,10,280,141,298
-275,275,13,596,181,299
-276,276,3,23,59,300
-277,277,7,198,162,301
-278,278,6,95,64,302
-279,279,12,280,164,303
-280,280,4,66,70,304
-281,281,8,202,140,305
-282,282,16,484,208,306
-283,283,5,17,63,308
-284,284,8,36,128,309
-285,285,4,45,65,310
-286,286,12,392,165,311
-287,287,8,240,83,312
-288,288,14,465,126,313
-289,289,20,1305,210,314
-290,290,5,55,65,315
-291,291,8,120,155,316
-292,292,8,12,95,317
-293,293,6,163,68,318
-294,294,10,405,126,319
-295,295,15,840,184,320
-296,296,10,864,87,321
-297,297,23,2538,184,322
-298,298,2,20,33,210
-299,299,10,970,108,323
-300,300,6,110,65,325
-301,301,11,326,138,326
-302,302,5,110,98,327
-303,303,6,115,98,328
-304,304,4,600,96,329
-305,305,9,1200,152,330
-306,306,21,3600,205,331
-307,307,6,112,91,332
-308,308,13,315,153,333
-309,309,6,152,104,334
-310,310,15,402,168,335
-311,311,4,42,120,336
-312,312,4,42,120,337
-313,313,7,177,146,338
-314,314,6,177,146,339
-315,315,3,20,152,341
-316,316,4,103,75,343
-317,317,17,800,168,344
-318,318,8,208,88,345
-319,319,18,888,175,346
-320,320,20,1300,137,347
-321,321,145,3980,206,348
-322,322,7,240,88,349
-323,323,19,2200,175,350
-324,324,5,804,161,351
-325,325,7,306,89,352
-326,326,9,715,164,353
-327,327,11,50,85,354
-328,328,7,150,73,355
-329,329,11,153,126,356
-330,330,20,820,197,357
-331,331,4,513,97,358
-332,332,13,774,177,359
-333,333,4,12,74,360
-334,334,11,206,188,361
-335,335,13,403,165,362
-336,336,27,525,165,363
-337,337,10,1680,150,364
-338,338,12,1540,150,365
-339,339,4,19,92,366
-340,340,9,236,158,367
-341,341,6,115,111,368
-342,342,11,328,161,369
-343,343,5,215,58,370
-344,344,15,1080,189,371
-345,345,10,238,99,372
-346,346,15,604,199,373
-347,347,7,125,99,374
-348,348,15,682,199,375
-349,349,6,74,61,376
-350,350,62,1620,213,377
-351,351,3,8,145,378
-352,352,10,220,132,382
-353,353,6,23,97,383
-354,354,11,125,179,384
-355,355,8,150,97,385
-356,356,16,306,179,386
-357,357,20,1000,169,388
-358,358,6,10,147,390
-359,359,12,470,174,391
-360,360,6,140,44,231
-361,361,7,168,74,392
-362,362,15,2565,187,393
-363,363,8,395,75,395
-364,364,11,876,128,396
-365,365,14,1506,192,397
-366,366,4,525,142,398
-367,367,17,270,178,399
-368,368,18,226,178,400
-369,369,10,234,198,401
-370,370,6,87,110,402
-371,371,6,421,89,403
-372,372,11,1105,144,404
-373,373,15,1026,218,405
-374,374,6,952,103,406
-375,375,12,2025,153,407
-376,376,16,5500,210,408
-377,377,17,2300,217,409
-378,378,18,1750,216,410
-379,379,19,2050,215,411
-380,380,14,400,211,412
-381,381,20,600,211,413
-382,382,45,3520,218,414
-383,383,35,9500,218,415
-384,384,70,2065,220,416
-385,385,3,11,215,417
-386,386,17,608,215,418
-387,387,4,102,64,422
-388,388,11,970,141,423
-389,389,22,3100,208,424
-390,390,5,62,65,425
-391,391,9,220,142,426
-392,392,12,550,209,427
-393,393,4,52,66,428
-394,394,8,230,143,429
-395,395,17,845,210,430
-396,396,3,20,56,431
-397,397,6,155,113,432
-398,398,12,249,172,433
-399,399,5,200,58,434
-400,400,10,315,116,435
-401,401,3,22,54,436
-402,402,10,255,159,437
-403,403,5,95,60,438
-404,404,9,305,117,439
-405,405,14,420,194,440
-406,406,2,12,68,340
-407,407,9,145,204,342
-408,408,9,315,99,441
-409,409,16,1025,199,442
-410,410,5,570,99,443
-411,411,13,1495,199,444
-412,412,2,34,61,445
-413,413,5,65,159,446
-414,414,9,233,159,449
-415,415,3,55,63,450
-416,416,12,385,188,451
-417,417,4,39,120,452
-418,418,7,295,75,453
-419,419,11,335,178,454
-420,420,4,33,68,455
-421,421,5,93,133,456
-422,422,3,63,73,457
-423,423,9,299,176,458
-424,424,12,203,186,219
-425,425,4,12,127,459
-426,426,12,150,204,460
-427,427,4,55,84,461
-428,428,12,333,178,462
-429,429,9,44,187,229
-430,430,9,273,187,227
-431,431,5,39,71,463
-432,432,10,438,183,464
-433,433,2,6,74,389
-434,434,4,192,79,465
-435,435,10,380,209,466
-436,436,5,605,72,467
-437,437,13,1870,188,468
-438,438,5,150,68,213
-439,439,6,130,78,139
-440,440,6,244,255,126
-441,441,5,19,107,469
-442,442,10,1080,168,470
-443,443,7,205,67,471
-444,444,14,560,144,472
-445,445,19,950,218,473
-446,446,6,1050,94,173
-447,447,7,202,72,474
-448,448,12,540,204,475
-449,449,8,495,95,476
-450,450,20,3000,198,477
-451,451,8,120,114,478
-452,452,13,615,204,479
-453,453,7,230,83,480
-454,454,13,444,181,481
-455,455,14,270,164,482
-456,456,4,70,90,483
-457,457,12,240,156,484
-458,458,10,650,108,257
-459,459,10,505,131,485
-460,460,22,1355,214,486
-461,461,11,340,199,245
-462,462,12,1800,211,90
-463,463,17,1400,193,120
-464,464,24,2828,217,125
-465,465,20,1286,211,130
-466,466,18,1386,199,147
-467,467,16,680,199,150
-468,468,15,380,220,204
-469,469,19,515,198,223
-470,470,10,255,196,163
-471,471,8,259,196,164
-472,472,20,425,192,238
-473,473,25,2910,207,252
-474,474,9,340,185,167
-475,475,16,520,208,307
-476,476,14,3400,198,324
-477,477,22,1066,210,387
-478,478,13,266,187,394
-479,479,3,3,132,487
-480,480,3,3,210,493
-481,481,3,3,210,494
-482,482,3,3,210,495
-483,483,54,6830,220,496
-484,484,42,3360,220,497
-485,485,17,4300,215,498
-486,486,37,4200,220,499
-487,487,45,7500,220,500
-488,488,15,856,210,502
-489,489,4,31,165,503
-490,490,3,14,215,504
-491,491,15,505,210,505
-492,492,2,21,64,506
-493,493,32,3200,255,508
-494,494,4,40,270,509
-495,495,6,81,28,510
-496,496,8,160,145,511
-497,497,33,630,238,512
-498,498,5,99,28,513
-499,499,10,555,146,514
-500,500,16,1500,238,515
-501,501,5,59,28,516
-502,502,8,245,145,517
-503,503,15,946,238,518
-504,504,5,116,51,519
-505,505,11,270,147,520
-506,506,4,41,55,521
-507,507,9,147,130,522
-508,508,12,610,221,523
-509,509,4,101,56,524
-510,510,11,375,156,525
-511,511,6,105,63,526
-512,512,11,305,174,527
-513,513,6,110,63,528
-514,514,10,280,174,529
-515,515,6,135,63,530
-516,516,10,290,174,531
-517,517,6,233,58,532
-518,518,11,605,170,533
-519,519,3,21,53,534
-520,520,6,150,125,535
-521,521,12,290,215,536
-522,522,8,298,59,537
-523,523,16,795,174,538
-524,524,4,180,56,539
-525,525,9,1020,137,540
-526,526,17,2600,227,541
-527,527,4,21,63,542
-528,528,9,105,149,543
-529,529,3,85,66,544
-530,530,7,404,178,545
-531,531,11,310,390,546
-532,532,6,125,61,547
-533,533,12,400,142,548
-534,534,14,870,227,549
-535,535,5,45,59,550
-536,536,8,170,134,551
-537,537,15,620,225,552
-538,538,13,555,163,553
-539,539,14,510,163,554
-540,540,3,25,62,555
-541,541,5,73,133,556
-542,542,12,205,221,557
-543,543,4,53,52,558
-544,544,12,585,126,559
-545,545,25,2005,214,560
-546,546,3,6,56,561
-547,547,7,66,168,562
-548,548,5,66,56,563
-549,549,11,163,168,564
-550,550,10,180,161,565
-551,551,7,152,58,567
-552,552,10,334,123,568
-553,553,15,963,229,569
-554,554,6,375,63,570
-555,555,13,929,168,571
-556,556,10,280,161,573
-557,557,3,145,65,574
-558,558,14,2000,166,575
-559,559,6,118,70,576
-560,560,11,300,171,577
-561,561,14,140,172,578
-562,562,5,15,61,579
-563,563,17,765,169,580
-564,564,7,165,71,581
-565,565,12,810,173,582
-566,566,5,95,71,583
-567,567,14,320,177,584
-568,568,6,310,66,585
-569,569,19,1073,166,586
-570,570,7,125,66,587
-571,571,16,811,179,588
-572,572,4,58,60,589
-573,573,5,75,165,590
-574,574,4,58,58,591
-575,575,7,180,137,592
-576,576,15,440,221,593
-577,577,3,10,58,594
-578,578,6,80,130,595
-579,579,10,201,221,596
-580,580,5,55,61,597
-581,581,13,242,166,598
-582,582,4,57,61,599
-583,583,11,410,138,600
-584,584,13,575,241,601
-585,585,6,195,67,602
-586,586,19,925,166,603
-587,587,4,50,150,604
-588,588,5,59,63,605
-589,589,10,330,173,606
-590,590,2,10,59,607
-591,591,6,105,162,608
-592,592,12,330,67,609
-593,593,22,1350,168,610
-594,594,12,316,165,611
-595,595,1,6,64,612
-596,596,8,143,165,613
-597,597,6,188,61,614
-598,598,10,1100,171,615
-599,599,3,210,60,616
-600,600,6,510,154,617
-601,601,6,810,234,618
-602,602,2,3,55,619
-603,603,12,220,142,620
-604,604,21,805,232,621
-605,605,5,90,67,622
-606,606,10,345,170,623
-607,607,3,31,55,624
-608,608,6,130,130,625
-609,609,10,343,234,626
-610,610,6,180,64,627
-611,611,10,360,144,628
-612,612,18,1055,243,629
-613,613,5,85,61,630
-614,614,26,2600,170,631
-615,615,11,1480,170,632
-616,616,4,77,61,633
-617,617,8,253,173,634
-618,618,7,110,165,635
-619,619,9,200,70,636
-620,620,14,355,179,637
-621,621,16,1390,170,638
-622,622,10,920,61,639
-623,623,28,3300,169,640
-624,624,5,102,68,641
-625,625,16,700,172,642
-626,626,16,946,172,643
-627,627,5,105,70,644
-628,628,15,410,179,645
-629,629,5,90,74,646
-630,630,12,395,179,647
-631,631,14,580,169,648
-632,632,3,330,169,649
-633,633,8,173,60,650
-634,634,14,500,147,651
-635,635,18,1600,270,652
-636,636,11,288,72,653
-637,637,16,460,248,654
-638,638,21,2500,261,655
-639,639,19,2600,261,656
-640,640,20,2000,261,657
-641,641,15,630,261,658
-642,642,15,610,261,659
-643,643,32,3300,306,660
-644,644,29,3450,306,661
-645,645,15,680,270,662
-646,646,30,3250,297,663
-647,647,14,485,261,664
-648,648,6,65,270,665
-649,649,15,825,270,667
-650,386,17,608,215,419
-651,386,17,608,215,420
-652,386,17,608,215,421
-653,413,5,65,159,447
-654,413,5,65,159,448
-655,492,4,52,64,507
-656,487,69,6500,220,501
-657,479,3,3,132,488
-658,479,3,3,132,489
-659,479,3,3,132,490
-660,479,3,3,132,491
-661,479,3,3,132,492
-662,351,3,8,147,379
-663,351,3,8,147,380
-664,351,3,8,147,381
-665,550,10,180,161,566
-666,555,13,929,189,572
-667,648,6,65,270,666
+id,species_id,height,weight,base_experience,order,is_default
+1,1,7,69,64,1,1
+2,2,10,130,141,2,1
+3,3,20,1000,208,3,1
+4,4,6,85,65,4,1
+5,5,11,190,142,5,1
+6,6,17,905,209,6,1
+7,7,5,90,66,7,1
+8,8,10,225,143,8,1
+9,9,16,855,210,9,1
+10,10,3,29,53,10,1
+11,11,7,99,72,11,1
+12,12,11,320,160,12,1
+13,13,3,32,52,13,1
+14,14,6,100,71,14,1
+15,15,10,295,159,15,1
+16,16,3,18,55,16,1
+17,17,11,300,113,17,1
+18,18,15,395,172,18,1
+19,19,3,35,57,19,1
+20,20,7,185,116,20,1
+21,21,3,20,58,21,1
+22,22,12,380,162,22,1
+23,23,20,69,62,23,1
+24,24,35,650,147,24,1
+25,25,4,60,82,26,1
+26,26,8,300,122,27,1
+27,27,6,120,93,28,1
+28,28,10,295,163,29,1
+29,29,4,70,59,30,1
+30,30,8,200,117,31,1
+31,31,13,600,194,32,1
+32,32,5,90,60,33,1
+33,33,9,195,118,34,1
+34,34,14,620,195,35,1
+35,35,6,75,68,37,1
+36,36,13,400,129,38,1
+37,37,6,99,63,39,1
+38,38,11,199,178,40,1
+39,39,5,55,76,42,1
+40,40,10,120,109,43,1
+41,41,8,75,54,44,1
+42,42,16,550,171,45,1
+43,43,5,54,78,47,1
+44,44,8,86,132,48,1
+45,45,12,186,184,49,1
+46,46,3,54,70,51,1
+47,47,10,295,128,52,1
+48,48,10,300,75,53,1
+49,49,15,125,138,54,1
+50,50,2,8,81,55,1
+51,51,7,333,153,56,1
+52,52,4,42,69,57,1
+53,53,10,320,148,58,1
+54,54,8,196,80,59,1
+55,55,17,766,174,60,1
+56,56,5,280,74,61,1
+57,57,10,320,149,62,1
+58,58,7,190,91,63,1
+59,59,19,1550,213,64,1
+60,60,6,124,77,65,1
+61,61,10,200,131,66,1
+62,62,13,540,185,67,1
+63,63,9,195,75,69,1
+64,64,13,565,145,70,1
+65,65,15,480,186,71,1
+66,66,8,195,75,72,1
+67,67,15,705,146,73,1
+68,68,16,1300,193,74,1
+69,69,7,40,84,75,1
+70,70,10,64,151,76,1
+71,71,17,155,191,77,1
+72,72,9,455,105,78,1
+73,73,16,550,205,79,1
+74,74,4,200,73,80,1
+75,75,10,1050,134,81,1
+76,76,14,3000,177,82,1
+77,77,10,300,152,83,1
+78,78,17,950,192,84,1
+79,79,12,360,99,85,1
+80,80,16,785,164,86,1
+81,81,3,60,89,88,1
+82,82,10,600,161,89,1
+83,83,8,150,94,91,1
+84,84,14,392,96,92,1
+85,85,18,852,158,93,1
+86,86,11,900,100,94,1
+87,87,17,1200,176,95,1
+88,88,9,300,90,96,1
+89,89,12,300,157,97,1
+90,90,3,40,97,98,1
+91,91,15,1325,203,99,1
+92,92,13,1,95,100,1
+93,93,16,1,126,101,1
+94,94,15,405,190,102,1
+95,95,88,2100,108,103,1
+96,96,10,324,102,105,1
+97,97,16,756,165,106,1
+98,98,4,65,115,107,1
+99,99,13,600,206,108,1
+100,100,5,104,103,109,1
+101,101,12,666,150,110,1
+102,102,4,25,98,111,1
+103,103,20,1200,212,112,1
+104,104,4,65,87,113,1
+105,105,10,450,124,114,1
+106,106,15,498,139,116,1
+107,107,14,502,140,117,1
+108,108,12,655,127,119,1
+109,109,6,10,114,121,1
+110,110,12,95,173,122,1
+111,111,10,1150,135,123,1
+112,112,19,1200,204,124,1
+113,113,11,346,255,127,1
+114,114,10,350,166,129,1
+115,115,22,800,175,131,1
+116,116,4,80,83,132,1
+117,117,12,250,155,133,1
+118,118,6,150,111,135,1
+119,119,13,390,170,136,1
+120,120,8,345,106,137,1
+121,121,11,800,207,138,1
+122,122,13,545,136,140,1
+123,123,15,560,187,141,1
+124,124,14,406,137,144,1
+125,125,11,300,156,146,1
+126,126,13,445,167,149,1
+127,127,15,550,200,151,1
+128,128,14,884,211,152,1
+129,129,9,100,20,153,1
+130,130,65,2350,214,154,1
+131,131,25,2200,219,155,1
+132,132,3,40,61,156,1
+133,133,3,65,92,157,1
+134,134,10,290,196,158,1
+135,135,8,245,197,159,1
+136,136,9,250,198,160,1
+137,137,8,365,130,165,1
+138,138,4,75,99,168,1
+139,139,10,350,199,169,1
+140,140,5,115,99,170,1
+141,141,13,405,199,171,1
+142,142,18,590,202,172,1
+143,143,21,4600,154,174,1
+144,144,17,554,215,175,1
+145,145,16,526,216,176,1
+146,146,20,600,217,177,1
+147,147,18,33,67,178,1
+148,148,40,165,144,179,1
+149,149,22,2100,218,180,1
+150,150,20,1220,220,181,1
+151,151,4,40,64,182,1
+152,152,9,64,64,183,1
+153,153,12,158,141,184,1
+154,154,18,1005,208,185,1
+155,155,5,79,65,186,1
+156,156,9,190,142,187,1
+157,157,17,795,209,188,1
+158,158,6,95,66,189,1
+159,159,11,250,143,190,1
+160,160,23,888,210,191,1
+161,161,8,60,57,192,1
+162,162,18,325,116,193,1
+163,163,7,212,58,194,1
+164,164,16,408,162,195,1
+165,165,10,108,54,196,1
+166,166,14,356,134,197,1
+167,167,5,85,54,198,1
+168,168,11,335,134,199,1
+169,169,18,750,204,46,1
+170,170,5,120,90,200,1
+171,171,12,225,156,201,1
+172,172,3,20,42,25,1
+173,173,3,30,37,36,1
+174,174,3,10,39,41,1
+175,175,3,15,74,202,1
+176,176,6,32,114,203,1
+177,177,2,20,73,205,1
+178,178,15,150,171,206,1
+179,179,6,78,59,207,1
+180,180,8,133,117,208,1
+181,181,14,615,194,209,1
+182,182,4,58,184,50,1
+183,183,4,85,58,211,1
+184,184,8,285,153,212,1
+185,185,12,380,135,214,1
+186,186,11,339,185,68,1
+187,187,4,5,74,215,1
+188,188,6,10,136,216,1
+189,189,8,30,176,217,1
+190,190,8,115,94,218,1
+191,191,3,18,52,220,1
+192,192,8,85,146,221,1
+193,193,12,380,147,222,1
+194,194,4,85,52,224,1
+195,195,14,750,137,225,1
+196,196,9,265,197,161,1
+197,197,10,270,197,162,1
+198,198,5,21,107,226,1
+199,199,20,795,164,87,1
+200,200,7,10,147,228,1
+201,201,5,50,61,230,1
+202,202,13,285,177,232,1
+203,203,15,415,149,233,1
+204,204,6,72,60,234,1
+205,205,12,1258,118,235,1
+206,206,15,140,125,236,1
+207,207,11,648,108,237,1
+208,208,92,4000,196,104,1
+209,209,6,78,63,239,1
+210,210,14,487,178,240,1
+211,211,5,39,100,241,1
+212,212,18,1180,200,142,1
+213,213,6,205,80,242,1
+214,214,15,540,200,243,1
+215,215,9,280,132,244,1
+216,216,6,88,124,246,1
+217,217,18,1258,189,247,1
+218,218,7,350,78,248,1
+219,219,8,550,154,249,1
+220,220,4,65,78,250,1
+221,221,11,558,160,251,1
+222,222,6,50,113,253,1
+223,223,6,120,78,254,1
+224,224,9,285,164,255,1
+225,225,9,160,183,256,1
+226,226,21,2200,168,258,1
+227,227,17,505,168,259,1
+228,228,6,108,114,260,1
+229,229,14,350,204,261,1
+230,230,18,1520,207,134,1
+231,231,5,335,124,262,1
+232,232,11,1200,189,263,1
+233,233,6,325,180,166,1
+234,234,14,712,165,264,1
+235,235,12,580,106,265,1
+236,236,7,210,91,115,1
+237,237,14,480,138,118,1
+238,238,4,60,87,143,1
+239,239,6,235,106,145,1
+240,240,7,214,117,148,1
+241,241,12,755,200,266,1
+242,242,15,468,255,128,1
+243,243,19,1780,216,267,1
+244,244,21,1980,217,268,1
+245,245,20,1870,215,269,1
+246,246,6,720,67,270,1
+247,247,12,1520,144,271,1
+248,248,20,2020,218,272,1
+249,249,52,2160,220,273,1
+250,250,38,1990,220,274,1
+251,251,6,50,64,275,1
+252,252,5,50,65,276,1
+253,253,9,216,141,277,1
+254,254,17,522,208,278,1
+255,255,4,25,65,279,1
+256,256,9,195,142,280,1
+257,257,19,520,209,281,1
+258,258,4,76,65,282,1
+259,259,7,280,143,283,1
+260,260,15,819,210,284,1
+261,261,5,136,55,285,1
+262,262,10,370,128,286,1
+263,263,4,175,60,287,1
+264,264,5,325,128,288,1
+265,265,3,36,54,289,1
+266,266,6,100,72,290,1
+267,267,10,284,161,291,1
+268,268,7,115,72,292,1
+269,269,12,316,161,293,1
+270,270,5,26,74,294,1
+271,271,12,325,141,295,1
+272,272,15,550,181,296,1
+273,273,5,40,74,297,1
+274,274,10,280,141,298,1
+275,275,13,596,181,299,1
+276,276,3,23,59,300,1
+277,277,7,198,162,301,1
+278,278,6,95,64,302,1
+279,279,12,280,164,303,1
+280,280,4,66,70,304,1
+281,281,8,202,140,305,1
+282,282,16,484,208,306,1
+283,283,5,17,63,308,1
+284,284,8,36,128,309,1
+285,285,4,45,65,310,1
+286,286,12,392,165,311,1
+287,287,8,240,83,312,1
+288,288,14,465,126,313,1
+289,289,20,1305,210,314,1
+290,290,5,55,65,315,1
+291,291,8,120,155,316,1
+292,292,8,12,95,317,1
+293,293,6,163,68,318,1
+294,294,10,405,126,319,1
+295,295,15,840,184,320,1
+296,296,10,864,87,321,1
+297,297,23,2538,184,322,1
+298,298,2,20,33,210,1
+299,299,10,970,108,323,1
+300,300,6,110,65,325,1
+301,301,11,326,138,326,1
+302,302,5,110,98,327,1
+303,303,6,115,98,328,1
+304,304,4,600,96,329,1
+305,305,9,1200,152,330,1
+306,306,21,3600,205,331,1
+307,307,6,112,91,332,1
+308,308,13,315,153,333,1
+309,309,6,152,104,334,1
+310,310,15,402,168,335,1
+311,311,4,42,120,336,1
+312,312,4,42,120,337,1
+313,313,7,177,146,338,1
+314,314,6,177,146,339,1
+315,315,3,20,152,341,1
+316,316,4,103,75,343,1
+317,317,17,800,168,344,1
+318,318,8,208,88,345,1
+319,319,18,888,175,346,1
+320,320,20,1300,137,347,1
+321,321,145,3980,206,348,1
+322,322,7,240,88,349,1
+323,323,19,2200,175,350,1
+324,324,5,804,161,351,1
+325,325,7,306,89,352,1
+326,326,9,715,164,353,1
+327,327,11,50,85,354,1
+328,328,7,150,73,355,1
+329,329,11,153,126,356,1
+330,330,20,820,197,357,1
+331,331,4,513,97,358,1
+332,332,13,774,177,359,1
+333,333,4,12,74,360,1
+334,334,11,206,188,361,1
+335,335,13,403,165,362,1
+336,336,27,525,165,363,1
+337,337,10,1680,150,364,1
+338,338,12,1540,150,365,1
+339,339,4,19,92,366,1
+340,340,9,236,158,367,1
+341,341,6,115,111,368,1
+342,342,11,328,161,369,1
+343,343,5,215,58,370,1
+344,344,15,1080,189,371,1
+345,345,10,238,99,372,1
+346,346,15,604,199,373,1
+347,347,7,125,99,374,1
+348,348,15,682,199,375,1
+349,349,6,74,61,376,1
+350,350,62,1620,213,377,1
+351,351,3,8,145,378,1
+352,352,10,220,132,382,1
+353,353,6,23,97,383,1
+354,354,11,125,179,384,1
+355,355,8,150,97,385,1
+356,356,16,306,179,386,1
+357,357,20,1000,169,388,1
+358,358,6,10,147,390,1
+359,359,12,470,174,391,1
+360,360,6,140,44,231,1
+361,361,7,168,74,392,1
+362,362,15,2565,187,393,1
+363,363,8,395,75,395,1
+364,364,11,876,128,396,1
+365,365,14,1506,192,397,1
+366,366,4,525,142,398,1
+367,367,17,270,178,399,1
+368,368,18,226,178,400,1
+369,369,10,234,198,401,1
+370,370,6,87,110,402,1
+371,371,6,421,89,403,1
+372,372,11,1105,144,404,1
+373,373,15,1026,218,405,1
+374,374,6,952,103,406,1
+375,375,12,2025,153,407,1
+376,376,16,5500,210,408,1
+377,377,17,2300,217,409,1
+378,378,18,1750,216,410,1
+379,379,19,2050,215,411,1
+380,380,14,400,211,412,1
+381,381,20,600,211,413,1
+382,382,45,3520,218,414,1
+383,383,35,9500,218,415,1
+384,384,70,2065,220,416,1
+385,385,3,11,215,417,1
+386,386,17,608,215,418,1
+387,387,4,102,64,422,1
+388,388,11,970,141,423,1
+389,389,22,3100,208,424,1
+390,390,5,62,65,425,1
+391,391,9,220,142,426,1
+392,392,12,550,209,427,1
+393,393,4,52,66,428,1
+394,394,8,230,143,429,1
+395,395,17,845,210,430,1
+396,396,3,20,56,431,1
+397,397,6,155,113,432,1
+398,398,12,249,172,433,1
+399,399,5,200,58,434,1
+400,400,10,315,116,435,1
+401,401,3,22,54,436,1
+402,402,10,255,159,437,1
+403,403,5,95,60,438,1
+404,404,9,305,117,439,1
+405,405,14,420,194,440,1
+406,406,2,12,68,340,1
+407,407,9,145,204,342,1
+408,408,9,315,99,441,1
+409,409,16,1025,199,442,1
+410,410,5,570,99,443,1
+411,411,13,1495,199,444,1
+412,412,2,34,61,445,1
+413,413,5,65,159,446,1
+414,414,9,233,159,449,1
+415,415,3,55,63,450,1
+416,416,12,385,188,451,1
+417,417,4,39,120,452,1
+418,418,7,295,75,453,1
+419,419,11,335,178,454,1
+420,420,4,33,68,455,1
+421,421,5,93,133,456,1
+422,422,3,63,73,457,1
+423,423,9,299,176,458,1
+424,424,12,203,186,219,1
+425,425,4,12,127,459,1
+426,426,12,150,204,460,1
+427,427,4,55,84,461,1
+428,428,12,333,178,462,1
+429,429,9,44,187,229,1
+430,430,9,273,187,227,1
+431,431,5,39,71,463,1
+432,432,10,438,183,464,1
+433,433,2,6,74,389,1
+434,434,4,192,79,465,1
+435,435,10,380,209,466,1
+436,436,5,605,72,467,1
+437,437,13,1870,188,468,1
+438,438,5,150,68,213,1
+439,439,6,130,78,139,1
+440,440,6,244,255,126,1
+441,441,5,19,107,469,1
+442,442,10,1080,168,470,1
+443,443,7,205,67,471,1
+444,444,14,560,144,472,1
+445,445,19,950,218,473,1
+446,446,6,1050,94,173,1
+447,447,7,202,72,474,1
+448,448,12,540,204,475,1
+449,449,8,495,95,476,1
+450,450,20,3000,198,477,1
+451,451,8,120,114,478,1
+452,452,13,615,204,479,1
+453,453,7,230,83,480,1
+454,454,13,444,181,481,1
+455,455,14,270,164,482,1
+456,456,4,70,90,483,1
+457,457,12,240,156,484,1
+458,458,10,650,108,257,1
+459,459,10,505,131,485,1
+460,460,22,1355,214,486,1
+461,461,11,340,199,245,1
+462,462,12,1800,211,90,1
+463,463,17,1400,193,120,1
+464,464,24,2828,217,125,1
+465,465,20,1286,211,130,1
+466,466,18,1386,199,147,1
+467,467,16,680,199,150,1
+468,468,15,380,220,204,1
+469,469,19,515,198,223,1
+470,470,10,255,196,163,1
+471,471,8,259,196,164,1
+472,472,20,425,192,238,1
+473,473,25,2910,207,252,1
+474,474,9,340,185,167,1
+475,475,16,520,208,307,1
+476,476,14,3400,198,324,1
+477,477,22,1066,210,387,1
+478,478,13,266,187,394,1
+479,479,3,3,132,487,1
+480,480,3,3,210,493,1
+481,481,3,3,210,494,1
+482,482,3,3,210,495,1
+483,483,54,6830,220,496,1
+484,484,42,3360,220,497,1
+485,485,17,4300,215,498,1
+486,486,37,4200,220,499,1
+487,487,45,7500,220,500,1
+488,488,15,856,210,502,1
+489,489,4,31,165,503,1
+490,490,3,14,215,504,1
+491,491,15,505,210,505,1
+492,492,2,21,64,506,1
+493,493,32,3200,255,508,1
+494,494,4,40,270,509,1
+495,495,6,81,28,510,1
+496,496,8,160,145,511,1
+497,497,33,630,238,512,1
+498,498,5,99,28,513,1
+499,499,10,555,146,514,1
+500,500,16,1500,238,515,1
+501,501,5,59,28,516,1
+502,502,8,245,145,517,1
+503,503,15,946,238,518,1
+504,504,5,116,51,519,1
+505,505,11,270,147,520,1
+506,506,4,41,55,521,1
+507,507,9,147,130,522,1
+508,508,12,610,221,523,1
+509,509,4,101,56,524,1
+510,510,11,375,156,525,1
+511,511,6,105,63,526,1
+512,512,11,305,174,527,1
+513,513,6,110,63,528,1
+514,514,10,280,174,529,1
+515,515,6,135,63,530,1
+516,516,10,290,174,531,1
+517,517,6,233,58,532,1
+518,518,11,605,170,533,1
+519,519,3,21,53,534,1
+520,520,6,150,125,535,1
+521,521,12,290,215,536,1
+522,522,8,298,59,537,1
+523,523,16,795,174,538,1
+524,524,4,180,56,539,1
+525,525,9,1020,137,540,1
+526,526,17,2600,227,541,1
+527,527,4,21,63,542,1
+528,528,9,105,149,543,1
+529,529,3,85,66,544,1
+530,530,7,404,178,545,1
+531,531,11,310,390,546,1
+532,532,6,125,61,547,1
+533,533,12,400,142,548,1
+534,534,14,870,227,549,1
+535,535,5,45,59,550,1
+536,536,8,170,134,551,1
+537,537,15,620,225,552,1
+538,538,13,555,163,553,1
+539,539,14,510,163,554,1
+540,540,3,25,62,555,1
+541,541,5,73,133,556,1
+542,542,12,205,221,557,1
+543,543,4,53,52,558,1
+544,544,12,585,126,559,1
+545,545,25,2005,214,560,1
+546,546,3,6,56,561,1
+547,547,7,66,168,562,1
+548,548,5,66,56,563,1
+549,549,11,163,168,564,1
+550,550,10,180,161,565,1
+551,551,7,152,58,567,1
+552,552,10,334,123,568,1
+553,553,15,963,229,569,1
+554,554,6,375,63,570,1
+555,555,13,929,168,571,1
+556,556,10,280,161,573,1
+557,557,3,145,65,574,1
+558,558,14,2000,166,575,1
+559,559,6,118,70,576,1
+560,560,11,300,171,577,1
+561,561,14,140,172,578,1
+562,562,5,15,61,579,1
+563,563,17,765,169,580,1
+564,564,7,165,71,581,1
+565,565,12,810,173,582,1
+566,566,5,95,71,583,1
+567,567,14,320,177,584,1
+568,568,6,310,66,585,1
+569,569,19,1073,166,586,1
+570,570,7,125,66,587,1
+571,571,16,811,179,588,1
+572,572,4,58,60,589,1
+573,573,5,75,165,590,1
+574,574,4,58,58,591,1
+575,575,7,180,137,592,1
+576,576,15,440,221,593,1
+577,577,3,10,58,594,1
+578,578,6,80,130,595,1
+579,579,10,201,221,596,1
+580,580,5,55,61,597,1
+581,581,13,242,166,598,1
+582,582,4,57,61,599,1
+583,583,11,410,138,600,1
+584,584,13,575,241,601,1
+585,585,6,195,67,602,1
+586,586,19,925,166,603,1
+587,587,4,50,150,604,1
+588,588,5,59,63,605,1
+589,589,10,330,173,606,1
+590,590,2,10,59,607,1
+591,591,6,105,162,608,1
+592,592,12,330,67,609,1
+593,593,22,1350,168,610,1
+594,594,12,316,165,611,1
+595,595,1,6,64,612,1
+596,596,8,143,165,613,1
+597,597,6,188,61,614,1
+598,598,10,1100,171,615,1
+599,599,3,210,60,616,1
+600,600,6,510,154,617,1
+601,601,6,810,234,618,1
+602,602,2,3,55,619,1
+603,603,12,220,142,620,1
+604,604,21,805,232,621,1
+605,605,5,90,67,622,1
+606,606,10,345,170,623,1
+607,607,3,31,55,624,1
+608,608,6,130,130,625,1
+609,609,10,343,234,626,1
+610,610,6,180,64,627,1
+611,611,10,360,144,628,1
+612,612,18,1055,243,629,1
+613,613,5,85,61,630,1
+614,614,26,2600,170,631,1
+615,615,11,1480,170,632,1
+616,616,4,77,61,633,1
+617,617,8,253,173,634,1
+618,618,7,110,165,635,1
+619,619,9,200,70,636,1
+620,620,14,355,179,637,1
+621,621,16,1390,170,638,1
+622,622,10,920,61,639,1
+623,623,28,3300,169,640,1
+624,624,5,102,68,641,1
+625,625,16,700,172,642,1
+626,626,16,946,172,643,1
+627,627,5,105,70,644,1
+628,628,15,410,179,645,1
+629,629,5,90,74,646,1
+630,630,12,395,179,647,1
+631,631,14,580,169,648,1
+632,632,3,330,169,649,1
+633,633,8,173,60,650,1
+634,634,14,500,147,651,1
+635,635,18,1600,270,652,1
+636,636,11,288,72,653,1
+637,637,16,460,248,654,1
+638,638,21,2500,261,655,1
+639,639,19,2600,261,656,1
+640,640,20,2000,261,657,1
+641,641,15,630,261,658,1
+642,642,15,610,261,659,1
+643,643,32,3300,306,660,1
+644,644,29,3450,306,661,1
+645,645,15,680,270,662,1
+646,646,30,3250,297,663,1
+647,647,14,485,261,664,1
+648,648,6,65,270,665,1
+649,649,15,825,270,667,1
+650,386,17,608,215,419,0
+651,386,17,608,215,420,0
+652,386,17,608,215,421,0
+653,413,5,65,159,447,0
+654,413,5,65,159,448,0
+655,492,4,52,64,507,0
+656,487,69,6500,220,501,0
+657,479,3,3,132,488,0
+658,479,3,3,132,489,0
+659,479,3,3,132,490,0
+660,479,3,3,132,491,0
+661,479,3,3,132,492,0
+662,351,3,8,147,379,0
+663,351,3,8,147,380,0
+664,351,3,8,147,381,0
+665,550,10,180,161,566,0
+666,555,13,929,189,572,0
+667,648,6,65,270,666,0
diff --git a/pokedex/data/csv/pokemon_forms.csv b/pokedex/data/csv/pokemon_forms.csv
index d812e37..1e56970 100644
--- a/pokedex/data/csv/pokemon_forms.csv
+++ b/pokedex/data/csv/pokemon_forms.csv
@@ -675,16 +675,16 @@ id,form_identifier,pokemon_id,introduced_in_version_group_id,is_default,is_battl
 674,z,201,3,0,0,230
 675,exclamation,201,5,0,0,230
 676,question,201,5,0,0,230
-677,sunny,662,5,0,1,379
-678,rainy,663,5,0,1,380
-679,snowy,664,5,0,1,381
-680,attack,650,7,0,0,419
-681,defense,651,7,0,0,420
-682,speed,652,6,0,0,421
+677,sunny,662,5,1,1,379
+678,rainy,663,5,1,1,380
+679,snowy,664,5,1,1,381
+680,attack,650,7,1,0,419
+681,defense,651,7,1,0,420
+682,speed,652,6,1,0,421
 683,sandy,412,8,0,0,445
 684,trash,412,8,0,0,445
-685,sandy,653,8,0,0,447
-686,trash,654,8,0,0,448
+685,sandy,653,8,1,0,447
+686,trash,654,8,1,0,448
 687,sunshine,421,8,0,1,456
 688,east,422,8,0,0,457
 689,east,423,8,0,0,458
@@ -705,23 +705,23 @@ id,form_identifier,pokemon_id,introduced_in_version_group_id,is_default,is_battl
 704,steel,493,8,0,0,508
 705,water,493,8,0,0,508
 706,unknown,493,8,0,0,508
-707,heat,657,9,0,0,488
-708,wash,658,9,0,0,489
-709,frost,659,9,0,0,490
-710,fan,660,9,0,0,491
-711,mow,661,9,0,0,492
-712,origin,656,9,0,0,501
-713,sky,655,9,0,0,507
+707,heat,657,9,1,0,488
+708,wash,658,9,1,0,489
+709,frost,659,9,1,0,490
+710,fan,660,9,1,0,491
+711,mow,661,9,1,0,492
+712,origin,656,9,1,0,501
+713,sky,655,9,1,0,507
 714,spiky-eared,172,10,0,0,25
-715,blue-striped,665,11,0,0,566
-716,zen,666,11,0,0,572
+715,blue-striped,665,11,1,0,566
+716,zen,666,11,1,0,572
 717,summer,585,11,0,0,602
 718,autumn,585,11,0,0,602
 719,winter,585,11,0,0,602
 720,summer,586,11,0,0,603
 721,autumn,586,11,0,0,603
 722,winter,586,11,0,0,603
-723,pirouette,667,11,0,0,666
+723,pirouette,667,11,1,0,666
 724,douse,649,11,0,0,667
 725,shock,649,11,0,0,667
 726,burn,649,11,0,0,667
diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py
index 4f35482..7d28164 100644
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -1072,17 +1072,13 @@ class Pokemon(TableBase):
         info=dict(description=u"The base EXP gained when defeating this Pokémon"))  # XXX: Is this correct?
     order = Column(Integer, nullable=False, index=True,
         info=dict(description=u"Order for sorting. Almost national order, except families are grouped together."))
+    is_default = Column(Boolean, nullable=False, index=True,
+        info=dict(description=u'Set for exactly one pokemon used as the default for each species.'))
 
     @property
     def name(self):
-        u"""Returns True iff the Pokémon is the base form for its species,
-        e.g. Land Shaymin.
-        """
-
         return self.default_form.pokemon_name or self.species.name
 
-    ### Not forms!
-
     def stat(self, stat_name):
         u"""Returns a PokemonStat record for the given stat name (or Stat row
         object).  Uses the normal has-many machinery, so all the stats are
@@ -1218,13 +1214,13 @@ class PokemonForm(TableBase):
     id = Column(Integer, primary_key=True, nullable=False,
         info=dict(description=u'A unique ID for this form.'))
     form_identifier = Column(Unicode(16), nullable=True,
-        info=dict(description=u"An identifier of the form, uniue among a species", format='identifier'))
+        info=dict(description=u"An identifier of the form, uniue among a species. May be None for the default form of the species.", format='identifier'))
     pokemon_id = Column(Integer, ForeignKey('pokemon.id'), nullable=False, autoincrement=False,
         info=dict(description=u'The ID of the base Pokémon for this form.'))
     introduced_in_version_group_id = Column(Integer, ForeignKey('version_groups.id'), autoincrement=False,
         info=dict(description=u'The ID of the version group in which this form first appeared.'))
     is_default = Column(Boolean, nullable=False,
-        info=dict(description=u'Set for exactly one form used as the default for each species.'))
+        info=dict(description=u'Set for exactly one form used as the default for each pokemon (not necessarily species).'))
     is_battle_only = Column(Boolean, nullable=False,
         info=dict(description=u'Set iff the form can only appear in battle.'))
     order = Column(Integer, nullable=False, autoincrement=False,
@@ -1917,7 +1913,7 @@ Pokemon.default_form = relationship(PokemonForm,
     primaryjoin=and_(
         Pokemon.id==PokemonForm.pokemon_id,
         PokemonForm.is_default==True),
-    uselist=False)
+    uselist=False, lazy='joined')
 Pokemon.items = relationship(PokemonItem,
     backref='pokemon')
 Pokemon.stats = relationship(PokemonStat,
@@ -1957,7 +1953,7 @@ PokemonEvolution.trade_species = relationship(PokemonSpecies,
 
 PokemonForm.pokemon = relationship(Pokemon,
     primaryjoin=PokemonForm.pokemon_id==Pokemon.id,
-    innerjoin=True)
+    innerjoin=True, lazy='joined')
 PokemonForm.species = association_proxy('pokemon', 'species')
 PokemonForm.version_group = relationship(VersionGroup,
     innerjoin=True)
@@ -1995,7 +1991,7 @@ PokemonMove.method = relationship(PokemonMoveMethod,
 PokemonStat.stat = relationship(Stat,
     innerjoin=True, lazy='joined')
 
-PokemonSpecies.parent_pokemon = relationship(PokemonSpecies,
+PokemonSpecies.parent_species = relationship(PokemonSpecies,
     primaryjoin=PokemonSpecies.evolves_from_species_id==PokemonSpecies.id,
     remote_side=[PokemonSpecies.id],
     backref='child_species')
@@ -2008,13 +2004,11 @@ PokemonSpecies.flavor_text = relationship(PokemonSpeciesFlavorText,
 PokemonSpecies.growth_rate = relationship(GrowthRate,
     innerjoin=True,
     backref='evolution_chains')
-PokemonSpecies.pokemon_habitat = relationship(PokemonHabitat,
+PokemonSpecies.habitat = relationship(PokemonHabitat,
     backref='species')
-PokemonSpecies.habitat = association_proxy('pokemon_habitat', 'name')
-PokemonSpecies.pokemon_color = relationship(PokemonColor,
+PokemonSpecies.color = relationship(PokemonColor,
     innerjoin=True,
     backref='species')
-PokemonSpecies.color = association_proxy('pokemon_color', 'name')
 PokemonSpecies.egg_groups = relationship(EggGroup,
     secondary=PokemonEggGroup.__table__,
     innerjoin=True,
@@ -2024,10 +2018,22 @@ PokemonSpecies.forms = relationship(PokemonForm,
     secondary=Pokemon.__table__,
     primaryjoin=PokemonSpecies.id==Pokemon.species_id,
     secondaryjoin=Pokemon.id==PokemonForm.pokemon_id,
-    order_by=Pokemon.order.asc())
+    order_by=(PokemonForm.order.asc(), PokemonForm.form_identifier.asc()))
+PokemonSpecies.default_form = relationship(PokemonForm,
+    secondary=Pokemon.__table__,
+    primaryjoin=and_(PokemonSpecies.id==Pokemon.species_id,
+            Pokemon.is_default==True),
+    secondaryjoin=and_(Pokemon.id==PokemonForm.pokemon_id,
+            PokemonForm.is_default==True),
+    uselist=False)
+PokemonSpecies.default_pokemon = relationship(Pokemon,
+    primaryjoin=and_(
+        PokemonSpecies.id==Pokemon.species_id,
+        Pokemon.is_default==True),
+    uselist=False, lazy='joined')
 PokemonSpecies.evolution_chain = relationship(EvolutionChain,
     innerjoin=True,
-    backref=backref('species', order_by=Pokemon.order.asc()))
+    backref=backref('species', order_by=PokemonSpecies.id.asc()))
 PokemonSpecies.dex_numbers = relationship(PokemonDexNumber,
     innerjoin=True,
     order_by=PokemonDexNumber.pokedex_id.asc(),