Full refactor, added filters on images