Some initial efforts on incorporating integrated quantities. Last push before big internal changes.