worked on cottage
Merge https://github.com/lxdr/Glidden into rayBranch
same