some working stuff, most broken though
Merge pull request #2 from dk77/magikarp

some working stuff, most broken though