realised that states are sub of type, corrected watcher issues