More work on the webjob for amazon..