re-jig todo