Updated TODO list, looking like it's getting tehre