More progress, needs clean-up