Implemented favoriting
Merged branched testing