initial import from Greg's work