moved TODOs to issues