moving some functionas around inthe watch parser