Almost there
Hook up to smacleod's work.