PR of initial master commits

May not need this or the hard coded delay value if you use the underscore approach above.