s05-us80: functions are done, still needs testing
s05-us79,80,81: all combined and tested
Merge branch 's05-us80' into dev