DSL + a couple of tests in place.