Amazon support plus some extras

Includes #38 + tests and some structural updates.