derp

Mostly derp commit before pull