removed todo and added it to the issues