Rough sketch of some ideas - partial checkin.