WIP working on adding rules