Added TODOs for people to hack on (no functional changes)