more progress
parser working