Added better exception handling, started integrating new parse files.