wip: beginning of major redesign