Final commit of assignment1