Added comments and a to-do list