working file

Bad rob, bad.
clean + clean-up of watch

because I'm dumb