Some extra TODO notes