Completely refactored cdn and s3 to work together
Reimplemented filtering