TODO has been added

Please mark completed tasks. If you have any to add, please verify with
me first.