Update/ami

Pulling in the branch from my git