Space interface refactor

Not intended to be checked in right now.

S.a.