rearranged code
merge fix
add parser to repo