This ended up being a very long term project due to various life events, still a few odds and ends to work out but completed for the most part.

Before:


After: