Partway to rework of setup