Redoing a bunch of stuff, again.