Tom - added object boundary logic for tank, restructured level objects