Massive changes - toggles up top but  still incomplete