Environment setup, ready to merge to mainline #2

Closed sandygoat closed 2 years ago