derp
Clean branch for rewrite