Moved away from SP alias
Added comments back in to dev build
Removed comments but preserving whitespace
Added ability to check if PK is a dimension
Build process