Finished assignment and added comments