DSL merge

Finally, the DSL is ready for production deployment.  It won't be long now before I take over the world!
Muahahahahahahahahaha!

And all in just 7 commits...