Merged

almost done merging, give me another half hour my family is being
annyoing but this should be running well. Atleast local is completely
correct