Adding code from Dan and JR 4am session
Merge branch 'rysnc4amDanandJRCode' into alexburnandalexmaster