Refactored code.
Added parsing of drill html.