Complete re-write of dimensional system of objects. Not quite complete