almost works...test DSL not uite right yet