New TODO, so we can get some proper foundations in this thing.