Python side of roi rework nearly finished