Work in progress to adapt to shotgun 4.0