Add goodbye message review & merge

Please review as I am finished!