still does not work, but also includes some fixes
Co-Authored-By: Bjorn Beishline <75190918+bjorntheprogrammer@users.noreply.github.com>