Adding a few bits and bobs it seems to require