Activity refactoring

Begins adding activity rules and evaluation