Started to refactor classes to use an interace PokeListener.