Added: TODO notes