swag at making it more DSL like