new parsing of dates, removed stuff from user thats not needed