[WIP] Fixing RMSD + regular spatial

So far I just have a test that fails, but that's a start...