updated project with engine functioning and mariano's parser