#24 Alternate approach.
#26 Beginning
#12 missed a file during the move to default