Add some additional work to TODO