WIP redesign.
Redesign wip.