Continue to port GMG codebase.