new slides
Adding calebs changes
Merging calebs changes into master