Convert "added" fields to proper Dates
Remove TODO