WIP reworking of the signatures