Tested and working

If you have any questions, feel free to reach out, and I'd be happy to answer them