Improving parsing code, and changing memory management. On its way,