added some actions...

and changed some of our code to match theirs, specifically the associations.
so, if shit breaks, that's where the problem will lie.