some refactoring
added basic setup, expand on auth started work on multiple watches
start of multiple files