initial lab 6 code
Merging upstream...