debugging and units madness
logging and trying to figure out units
Merge remote branch 'origin/med_res' into med_res