Redesign v3(ish)

by Sean O'Grady