add in all of the remaining items from the Kata (trivial now code is
refactored)