Redesign, big bulky bad bear commit