TimW + RachelN : enable disable working, refactored agent list
TimW + RachelN : enable disable working, refactored agent list