progress on condensing stuff