Escaping

The test runs green. Wanna merge this?