Total rebase, cleanup, lots done.