Removed most of the sub-variable stuff
Back to moving objects around...