Fixed #6, added new date parsing/storage