Time for a redesign.

Richard's back in...