added watch & WIP: refactor script
WIP: refactor script