Sams changes

Sam did a lot of stuff