Two more assignments

Assignment 3 not yet finished.