initial work to upgrade plugin to 2.3.x