Next minor

Merging back in because this branch was kind of unnecessary