TODO: Continue working on hyperspace