Rework "solhaven" scripts to better facilitate re-use