Jhbate/acceptinvite

spoke with @kentquirk and agreed we will merge this to master