Added some getters and a handleMove function.
Cleanup