Updated with my method and a test for Mick's method. We do not have the
rest of the methods written so the tests must be rudementary for now.