basic parsing algorithm and framework updated