Adding better date parsing, still needs fix.