Code Katas Use Case 2 and Case 1 - still todo