mixing in Joe's outline, some other additions