Added orbit_rows functionality back in (still needs actual test case with multiple orbits)