Add escape option and test, remove leftover class option stuff