Pushing current state of code to resolve some revert warning messages