Further job and event handler work

Further job and event handler work
Work

More work