Added a bunch of things and added a ToDo entry
Merged ToDo changed