Finally fixed the circular inclusion errors, code is a bit messy but gotta push this before i break it again, sorry it took so long >.>