First version of watchlist with tests