More progress... still working