Fixed bug. Game works. Refactoring and Unit tests to follow