Done, but in the other branch, "multiple-users" there have been a lot of changes to the controllers and the views, so I am not going to spend too much time on correcting any back end code.