whole bunch of things - pomo sprint #7 and #8 or so