Reimplementing spaces to hopefully solve some issues