Completed assignment

With additional comments