Import from bletchley repo