Added a few features to the TODO