Made use of decorator implementation when rule checking
Hacked controller to work, we will be redesigning it anyway
Extra old classes/rules removed, see previous revision to gain access to code again