toDo done (more or less)

v0.2