Endless build problem. Stashing changes to start over.
All fixed, merging