Added highlight parsing code.
Changed functions to return error message rather than throw exceptions.