pushing most of this previous work up.