Started adding commetns to OptCommon