Worked on support for adding tasks...nearly there