Add snomasks and self mode tracking
Really reset everything