Edited rule storage to be more generic
Adding thoughts on implementation plan