WIP minor refactor and watch support