Added issue numbers for most core TODOs