Playing catchup - Solution for 2.1
Solution for 2.2