Rule added and other changes

I'm not sure if this is exactly what you were thinking of for the rules. Let me know.