moved TODOs to gitissues