Made a ton of changes ye