Changes: continued working on to-do list of functions.