Do some tests, attempt optimization. Rename aliases to triggers. Add test.