Supervision work in progress

Supervision work in progress