Refactored, using Strategy Pattern

Trying to use Strategy pattern for Movement.  Also removed a ton of code
that shouldn't have been there in the first place.