Pull request for breaking changes

woo, breaking