Re-jigged how the rules are passed around
Fixed 2 broken tests
Got all tests working