Assignment 6 - initial commit