Another reboot, this is silly

Starting to change feedback from