jon starting rework of structure