WIP - Add watch to all, attempting to make interface better