Some small progress, still a way to go...