Adding in Angela's changes

Did not add her add new task function since there is one in there
akready