Made some progress, issues still persist.