Full Rework

Map/Favo