Removed todo, converted todos to GH issues.