Added everything
merge conflicts