Started work on custom rule set