Continued changes.  Added favorite handling