#3, #9
Started to rewrite xml parser