Wire up stuff

Bit sparse on tests here ... suggestions welcome!