Further TODO notes