Improved object model. Still need to finish off CD and start on HUD