Will/amazon

closes #27