re-implemented all the changes i deleted locally
now added all the files i forgot
mergefix