Completed basic refactor of Triggers. Functional again, but more refactoring to come.