More progress, tests needed.