updated data structure, added momentjs for date formatting