ok, I'm fine with merging this @weaverryan