Moving favorites v1 over to master