html escaping
Finishing up first version