moved TODOs to issue tracker