Lab 2 Final Master

Finished and tested!