Added details asome TODOs