Fix escaping buherator
Initial steps