Made a shit ton of changes