An experimental refactor of some of the ghost stuff - this is *only* a spike