Added some todos/comments.
implement rename and delete
cleanup
Some more manual tests