Updates for second class, first deliverable