Third Commit

 - Changes from Class 4/26