Refactor Upscaling to Filtering

These are two separate things