Added todo items from talk with Paul