I believe I fixed the issue, still need to do a code review after taking a break to see if there are any other issues lingering.