Broken commit. Working on escaping