Added some more triggers. TODO: I should test this at some point before I get too far in. Also still need data.