WIP
WIP
Switched rules to simply use lambdas'