Image logic completed and tests passing