Msgr

This is a continuation of #174 by @Antes to include upgrade.