I think I fixed the big glaring issue!