First crack at updating Pokemon class