Draft of new deposit logic