Merge pull request #15 from wrightmikea/dsl

Dsl
checkpoint refactoring; note one broken test due to commented out implementation in scenario building dsl--added TODOs