Assignment 23/10

Completed assignment as of 23/10 including comments