added some parsing

Still needs work