Refactor compass watch to work with docs to