Finalizing Implementation.
Merge remote-tracking branch 'origin/messagestarring' into messagestarring