add to, and prioritize the TODO a little.