Added notes for things to change. Any indented text is something that needs to be fixed