Rewrite

I'm just about done with the old code. Replace it!