This is a pull request Final

Ready to ship @PeterBell @firstdegree @scottjnitz