modified naming-scheme
wrote a rather complete todo-list