Initial redesign work
WIP
More halting design work