Add Task WIP - bug fixes and features