cleanup pass one
import more from s3
more cleanup
move to class approach to responses