WIP major rehaul to accommodate nested span tags

older parsing engine was incorrect, using htmlparser library now in a
lot of places now. WIP - broken JUnits