Finished problem two

Most of the way through problem one ... taking a detour.