Rule 04 implemented
Progress on covering the tests