Started to rework and fix the execution monitor