Made changes, have mostly everything done. 
Going to change:

What format we have the key in when implemented watchers.

Need help with how to remove-watch correctly.