refactored tagging so it could be part of Spaces