Develop

I think that makes sense.

Can we talk about this more tomorrow? I might need some help thinking of ways to do this.

In the interim: I feel like this is ready to go. The error handling has been this way from the beginning, so cutting a release without a revamp should be ok for me.