Re-wrote amazon usage
Added push functionality