Added first steps of parser and some todos
add