Restructured program. Now have a reliable system for representing game state