Attempted to add watcher and bug fixes for registration