New features

I'm going to go ahead & merge these changes into master on my fork, since our team has been using them heavily for the past 9 months and they've been working well.