20-2, cleanup but still have step 3 for wrong answer step 2- maybe confer with Matt
Merge branch '20-2' into dev