Added more to TO-DO list