Swapping feature/ Ecency challenge