WIP
remove TODO
Merge branch 'tap'
bump to 0.2.2