merge work on parser into index.html