ADD watch for html and php; RM Todos relevent to wpArchitect