WIP: More progress, more simplicity.  Put and Get working, test needs work