Still sorting out spaces