Completed lab 7 and 8

Actual starting point for the project 2