refactor list and watch logic out #1523
+1,383
−1,295
Merged
Loading