almost done adding all the new features i need
finished testing html escaping