Pull request for breaking changes

woo, breaking
... Yep, you're right. I'll fix that.