Move TODO to relevant code
Bump to 0.0.2-SNAPSHOT