Got working macros, but watch is failing
Move some code around
Update code to use new macros

Move code into relevant files and define watches through new macros.