[WIP] Feature/AddFavorites