added users and favouriting. refactoring