Integrated parser into engine
Fixed merge conflict in engine.py