game logic overhaul

Can this be private?