Finished lab 4
Merged with upstream