Update for todo comments
Updates for v0.0.1