Changes: continued working on functionality to-do list.