major refactor, experimental event model
more intuitive dev boundary titles