Speed up, slow down
basic movement
clean up
Merge pull request #4 from khasinski/master

Basic movement, cleaned up