more shunt work, not completed yet