Added changes .everything's basically working