mostly done except for switching repos and branches