Added a bit of rule logic stuff
Created some convenience methods
Finished up rules