Some more work on how rules will be managed/saved, trying to keep it modular