I would prefer if the TODO's were removed before merge and made into bugs.