started adding todo.txt stuff
fixed merge conflict