Issue3

Completely fixed Issue #3 properly. Pokemon works in the way we intended.