Added a more dsl-like format

Could use some cleaning up.