Added date parsing. Hopefully