Added move to indexes. Added Plane. Cleanups and optimisations