Porting/cleaning up existing lab 7 files into new project