Feature/mode management

(should remove the need for existential quantification)