partial refactor of basescape
Merge pull request #311 from xanscale/master

refactor of basescape