Finally fixed everything… Ugh