Rework the transfers stuff