Addign favourites, introduced some bugs though
Added in favourites but need to fix bugs.
Favourites appear to work now
Merge branch 'james'