App works and tests pass - Spending too much time tweaking this game