Completed some more of part 1. Started building shell for part 2
More progress towards part 2