Trying to merge in engine code.