Added more features to the TODO.