save before merge
save before merge
save before merge
save before merge
save before laptop merge
update turb_info with flux
includes flux now
merge with lone*