done with some html stuff, still needs testing