Made some big changes, lol