refactored Spaces.  this is cool.