New TODO things to add or at least think about