Initial check in of code drop from Max