refactor done, working on new task functionality