Started to add routine/session control