A butt ton of changes that I havent committed yet