Add Rules stuff - still in progress
Add Rules stuff finished
Merge remote-tracking branch 'origin/master'