prepping for hybrid merge to master