Polished Rule System
Merge branch 'Generics' into Rules