Added libs.
Added more aws.
Cleanup
Cleanup