pretty much a complete rework of the design