Added second part of assignment, not quite complete, but mostly there