Fleshing out some self deposits for issue #44