95% complete HTML parser; DB code refactor