Final Commit for Week 1

cleaning up with last minute changes