Finished most of it but need to do one thing to make sure it actually
works