All errors fixed, now for the rewrite!