Clean up the date Regexp, add the new offset.years and strftime to the mix