Fixed Everything that was gone. Do not push while merging.