Complete TODO 5 of HW 2.
Optionals tweak in TODO 1-4