Merge pull request #1 from montlebalm/watchlists

Adding Watchlists
Minor cleanup