See todo.txt for changes yet to be done