More progress - kind of works