spacetime: reorganizing, testing types.