Final testing stuff, next commit is gonna be the real changes lol