Kinda did a rewrite

Rewrite!