Removed TODO - changed them to Issues instead