Temporary commit add some additional task and event functionality