Added a stupid amount of changes to everything