attempt to port to new spacetime classes