Hacked on the Spatial thing...