Game logic works, thanks Dave for refactoring everything as usual...