More commits to come, just gonna do this now so i dont have to fix things later