Big module upgrade

Creating a PR so @buildhive can validate my local testing