Wired in new suggest rules function.
Tidy up.
Merge remote-tracking branch 'origin/feature-suggest_rules' into dev