temp fixes
started adding a DSL