Rewrite on a lot of stuff... again.