much better TODO thoughts