Made final code changes for lab7, pushing up code