Tweaks to get tests passing, list sharing just about works now.