First draft for UATs - not yet using REST