Implemented initial watch functionality