working ont eh dsl
working on remove test - remove needs work :(