Changes: working on to-do list of missing functionality.