Lots of changes

Upload of the changes we made this morning