First commit of assignment - I hope it is OK