Update to work with new object-based game. More changes coming..