refactor function names and add support for having the watchlist as default list