more headswapping

UI still to come; probably fixes still to come too