Added todo list and fixed depth bug