Adding items to TODO list at Andy's request