First pass at some additional actions/filters necessary for goodness.