merging in release, I was bad. Shouldn't have been working on release