finish 1st version of model parser