Added escaping to things