Refactor, game should now work