ditch own parser for an external lib to help with readability
add test files
merge