Pull for Favourites support

I wouldn't mind more testing before it gets merged and/or released but it was pretty solid for me so I'm ready to go.