Added the Unit Class and moved properties and methods over. Changed instances of movable to unit as needed.