added beginning of parsing class