Made a bit more progress myself...