Port of m_SO to std::list is code complete and builds