Ability to escape, and a bit of a refactor