Feature

Please review, @erinnichols
Are you sure you should have added this feature? It's a pretty drastic change.