Refactored to remove Sub

Everything is stored in GameState -- simplifies compares