Done for now, future revisions when assignment 2 is published