Working on changes, promise map function aren't right yet