diff --git a/src/main.rs b/src/main.rs
index f8c8030..4f8da4c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,14 +1,9 @@
-use std::{
-    io::Read,
-    os::unix::fs::MetadataExt,
-    process::Command,
-};
+use std::{io::Read, os::unix::fs::MetadataExt, process::{exit, Command}};
 
 use actix_multipart::form::{MultipartForm, tempfile::TempFile};
-use actix_web::{
-    App, Either, Error, HttpResponse, HttpServer, Responder, get, post,
-};
+use actix_web::{App, Either, Error, HttpResponse, HttpServer, Responder, get, post, web};
 use anyhow::format_err;
+use serde::Deserialize;
 use tempfile::NamedTempFile;
 use tracing::{Level, event, instrument};
 // use serde::Deserialize;
@@ -51,10 +46,17 @@ async fn echo_image(MultipartForm(form): MultipartForm<UploadImageForm>) -> impl
         .body(file_contents.clone());
 }
 
+#[derive(Deserialize, Debug)]
+struct JpegOptions {
+    quality: Option<u8>,
+}
+
 #[instrument]
 #[post("/jpeg")]
-async fn jpeg(MultipartForm(form): MultipartForm<UploadImageForm>) -> impl Responder {
-    
+async fn jpeg(
+    MultipartForm(form): MultipartForm<UploadImageForm>,
+    options: web::Query<JpegOptions>,
+) -> impl Responder {
     match is_file_image(&form.file.content_type) {
         Some(x) => return x,
         None => {}
@@ -68,9 +70,13 @@ async fn jpeg(MultipartForm(form): MultipartForm<UploadImageForm>) -> impl Respo
     // let img = ImageReader::new(Cursor::new(input_file_contents)).with_guessed_format().unwrap().decode().unwrap();
     let jpeg = tempfile::NamedTempFile::new().unwrap();
 
-    let status = encode_jpeg(&form.file.file, &jpeg, Some(5)).await;
+    let status = encode_jpeg(&form.file.file, &jpeg, options.quality).await;
     if status.is_err() {
-        event!(Level::ERROR, "jpeg compression failed:\n{:?}", status.unwrap());
+        event!(
+            Level::ERROR,
+            "jpeg compression failed:\n{:?}",
+            status.unwrap()
+        );
         return HttpResponse::InternalServerError().body("Compression failed");
     }
 
@@ -98,7 +104,11 @@ async fn jpeg(MultipartForm(form): MultipartForm<UploadImageForm>) -> impl Respo
 }
 
 #[instrument]
-async fn encode_jpeg(input: &NamedTempFile, output: &NamedTempFile, quality: Option<u8>) -> Result<(), anyhow::Error> {
+async fn encode_jpeg(
+    input: &NamedTempFile,
+    output: &NamedTempFile,
+    quality: Option<u8>,
+) -> Result<(), anyhow::Error> {
     let jpeg_quality = match quality {
         Some(x) => {
             if x > 100 {
@@ -117,10 +127,7 @@ async fn encode_jpeg(input: &NamedTempFile, output: &NamedTempFile, quality: Opt
         jpeg_quality
     );
 
-    let optimise_command = format!(
-        "jpegoptim {}",
-        output.path().display()
-    );
+    let optimise_command = format!("jpegoptim {}", output.path().display());
 
     let _output = Command::new("sh")
         .arg("-c")
@@ -129,7 +136,7 @@ async fn encode_jpeg(input: &NamedTempFile, output: &NamedTempFile, quality: Opt
         .expect("failed to execute process");
 
     // event!(Level::INFO, "{:?}", _output);
-    
+
     let _output = Command::new("sh")
         .arg("-c")
         .arg(optimise_command)
@@ -141,6 +148,146 @@ async fn encode_jpeg(input: &NamedTempFile, output: &NamedTempFile, quality: Opt
     Ok(())
 }
 
+#[derive(Deserialize, Debug)]
+struct AVIFOptions {
+    quality: Option<u8>,
+    speed: Option<u8>,
+    depth: Option<u8>,
+    lossless: Option<bool>,
+    target_size: Option<u64>,
+}
+
+#[instrument]
+#[post("/avif")]
+async fn avif(
+    MultipartForm(form): MultipartForm<UploadImageForm>,
+    options: web::Query<AVIFOptions>,
+) -> impl Responder {
+    match is_file_image(&form.file.content_type) {
+        Some(x) => return x,
+        None => {}
+    }
+
+    let input_type = form.file.content_type.clone().unwrap();
+    match input_type.subtype().as_str() {
+        "png" => {},
+        "jpg" => {},
+        "jpeg" => {},
+        _ => {return HttpResponse::BadRequest().body("Only PNG and JPEG inputs are allowed for AVIF at the moment");}
+    }
+
+    let mut reader = std::io::BufReader::new(form.file.file.as_file());
+    let input_file_contents = &mut vec![];
+    let _ = reader.read_to_end(input_file_contents);
+    drop(reader);
+
+    // let img = ImageReader::new(Cursor::new(input_file_contents)).with_guessed_format().unwrap().decode().unwrap();
+    let avif = tempfile::NamedTempFile::new().unwrap();
+
+    let status = encode_avif(&form.file.file, &avif, options.0).await;
+    if status.is_err() {
+        event!(
+            Level::ERROR,
+            "avif compression failed:\n{:?}",
+            status.unwrap()
+        );
+        return HttpResponse::InternalServerError().body("Compression failed");
+    }
+
+    let mut reader = std::io::BufReader::new(&avif);
+    let output_file_contents = &mut vec![];
+    let _ = reader.read_to_end(output_file_contents);
+
+    let size_percentage = avif.as_file().metadata().unwrap().size() * 100 / form.file.size as u64;
+
+    event!(
+        Level::INFO,
+        "{} is now {}% of origional size as an {}!",
+        &form.file.content_type.unwrap(),
+        size_percentage,
+        "image/avif"
+    );
+
+    return HttpResponse::Ok()
+        .content_type("image/avif")
+        .append_header((
+            "content-disposition",
+            format!("filename=\"{}.avif\"", form.file.file_name.unwrap()),
+        ))
+        .body(output_file_contents.clone());
+}
+
+#[instrument]
+async fn encode_avif(
+    input: &NamedTempFile,
+    output: &NamedTempFile,
+    options: AVIFOptions,
+) -> Result<(), anyhow::Error> {
+    let avif_quality = match options.quality {
+        Some(x) => {
+            if x > 100 {
+                return Err(format_err!("Invalid quality value"));
+            } else {
+                x
+            }
+        }
+        None => 75,
+    };
+
+    let is_lossless = match options.lossless {
+        Some(x) => x,
+        _ => false,
+    };
+
+    let encode_speed = match options.speed {
+        Some(x) => {
+            if x > 10 {
+                10
+            } else {
+                x
+            }
+        }
+        _ => 6,
+    };
+
+    let image_depth = match options.depth {
+        Some(x) => {match x {
+            12 => 12,
+            10 => 10,
+            _ => 8
+        }},
+        _ => 8
+    };
+
+    let mut avif_command = format!(
+        "avifenc -o {} -s {} -d {}",
+        output.path().display(),
+        encode_speed,
+        image_depth
+    );
+
+    if is_lossless {
+        avif_command.push_str(" -l");
+    } else if options.target_size.is_some() {
+        avif_command.push_str(&format!(" --target-size {}", options.target_size.unwrap()));
+    } else {
+        avif_command.push_str(&format!(" -q {}", avif_quality));
+    }
+
+    avif_command.push_str(&format!(" {}", input.path().display()));
+
+    let _output = Command::new("sh")
+        .arg("-c")
+        .arg(avif_command)
+        .output()
+        .expect("failed to execute process");
+
+    event!(Level::INFO, "{:?}", _output);
+    // event!(Level::INFO, "{:?}", avif_command);
+
+    Ok(())
+}
+
 /// Returns `None` if file content_type starts with 'image' otherwise returns with an error response to serve to client
 #[instrument]
 fn is_file_image(input_mime: &Option<mime::Mime>) -> Option<HttpResponse> {
@@ -161,7 +308,7 @@ fn is_file_image(input_mime: &Option<mime::Mime>) -> Option<HttpResponse> {
 async fn main() -> std::io::Result<()> {
     tracing_subscriber::fmt::init();
 
-    HttpServer::new(|| App::new().service(hello).service(echo_image).service(jpeg))
+    HttpServer::new(|| App::new().service(hello).service(echo_image).service(jpeg).service(avif))
         .bind(("127.0.0.1", 3970))?
         .run()
         .await