Made some progress finally!