Us/982/taskboard refactor