Added more comments and a TODO list