Start of tap, update DSL, more tests.