WIP: round two of the exercise
Merge branch 'second_pass'

n00b learning