Moved to pdbartlett/shared/stuff