diff --git a/_layouts/default.html b/_layouts/default.html
index efd48e5a7..58187aa12 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -47,46 +47,16 @@
       <li class="col-xs-4 col-md-2"><h2>Community</h2>
         <ul>
           <li>
-            <a href="https://github.com/rust-lang/rust">GitHub</a>
+            <a href="http://this-week-in-rust.org/">News</a>
           </li>
 	  <li>
-	    <a href="https://users.rust-lang.org">User Forum</a>
+	    <a href="community.html">Community</a>
 	  </li>
-          <li>
-            <a href="https://chat.mibbit.com/?server=irc.mozilla.org&amp;channel=%23rust">IRC</a>
-          </li>
-          <li>
-            <a href="https://reddit.com/r/rust">Reddit</a>
-          </li>
-        </ul>
-      </li>
-      <li class="col-xs-4 col-md-2"><h2>&nbsp;</h2>
-        <ul>
-          <li>
-            <a href="https://stackoverflow.com/questions/tagged/rust">Stack Overflow</a>
-          </li>
-          <li>
-	    <a href="https://twitter.com/rustlang">Twitter</a>
-          </li>
-          <li>
-            <a href="http://blog.rust-lang.org">Blog</a>
-          </li>
-          <li>
-            <a href="https://www.google.com/calendar/embed?src=apd9vmbc22egenmtu5l6c5jbfc%40group.calendar.google.com">Calendar</a>
-          </li>
-        </ul>
-      </li>
-      <li class="col-xs-4 col-md-2"><h2>&nbsp;</h2>
-        <ul>
-          <li>
-            <a href="team.html">Team</a>
-          </li>
           <li>
             <a href="legal.html">Legal</a>
           </li>
         </ul>
       </li>
-    </ul>
   </header>
       {{ content }}
     <script>
diff --git a/community.md b/community.md
new file mode 100644
index 000000000..06de934fd
--- /dev/null
+++ b/community.md
@@ -0,0 +1,230 @@
+---
+layout: default
+title: Community
+---
+
+# Rust Community
+
+Rust is an amazing programming language, but its greatest strength
+is its kind and inclusive community.
+
+We are committed to providing a friendly, safe and welcoming
+environment for all, regardless of gender, sexual orientation,
+disability, ethnicity, religion, or similar personal
+characteristic. Our [code of conduct][coc] sets the standards for
+behavior in all official Rust forums, and is upheld by the
+[moderation team][mod_team_email].
+
+[coc]: https://www.rust-lang.org/conduct.html
+
+## TL;DR
+
+The most important community resources for getting started with Rust are:
+
+- The [#rust][rust_irc] IRC channel, a very friendly channel that
+  loves answering questions at any depth.
+- The [users forum][users_forum] for asynchronous discussion about all
+  things Rust.
+- The [This Week in Rust][twir] newsletter, to keep up with what's
+  happening in the community.
+
+## News
+
+[This Week in Rust][twir] collects the latest news, upcoming events
+and a week-by-week account of changes in the Rust language and
+libraries.
+
+[The Rust Blog][rust_blog] is where the Rust team makes announcements
+about major developments.
+
+The Rust community has an [*unofficial* subreddit][reddit] where
+virtually everything happening in the Rust community is discussed.
+The forum abides by the [official code of conduct][reddit_coc].
+
+We also have an official [Twitter][twitter] account.
+
+[twir]: http://this-week-in-rust.org/
+[rust_blog]: http://blog.rust-lang.org/
+[reddit]: https://www.reddit.com/r/rust
+[reddit_coc]: https://www.reddit.com/r/rust/comments/2rvrzx/our_code_of_conduct_please_read/
+[twitter]: https://twitter.com/rustlang
+
+## How to Get Help
+
+### Moderation
+
+[Rust Moderation Team][mod_team]
+
+If you feel you have been or are being harassed or made uncomfortable
+by a community member, please [contact][mod_team_email] any of the
+Rust moderation team immediately. Whether you're a regular contributor
+or a newcomer, we care about making the community a safe space for
+you.
+
+[mod_team]: https://www.rust-lang.org/team.html#Moderation
+[mod_team_email]: mailto:rust-mods@googlegroups.com
+
+### IRC Channels
+
+Rustaceans maintain a number of friendly, high-traffic IRC channels.
+
+The [#rust][rust_irc] channel on Moznet is a venue for general
+discussion about Rust, and a good place to ask for help. You'll find
+people willing to help you with any questions you may have, and
+responses are typically very fast.
+
+To get involved in the development of Rust itself, for anything about
+contribution, or to find a mentor, [#rust-internals][internals_irc] is
+the right channel.
+
+There are also some more specific IRC channels
+noted below.
+
+#### Core channels
+
+- [#rust][rust_irc] is for all things Rust
+- [#rust-internals][internals_irc] is for discussion of other Rust implementation topics
+- [#rustc][rustc_irc] is the home of the [compiler team][compiler_team]
+- [#rust-libs][libs_irc] is the home of the [libraries team][library_team]
+- [#rust-tools][tools_irc] is the home of the [tools and infrastructure team][tool_team]
+- [#rust-lang][lang_irc] is the home of the [language team][language_team]
+- [#rust-community][community_irc] is the home of the [community team][community_team]
+
+#### Topical channels
+
+- [#cargo][cargo_irc] is for discussion of Cargo, Rust's package manager
+- [#servo][servo_irc] is for discussion of Servo, the browser engine written in Rust
+- [#rust-offtopic][offtopic_irc] is for general chit-chat amongst Rustaceans
+- [#rust-crypto][crypto_irc] is for discussion of cryptography in Rust
+- [#rust-osdev][osdev_irc] is for people doing OS development in Rust
+- [#rust-webdev][webdev_irc] is for people doing web development in Rust
+- [#rust-gamedev][gamedev_irc] is for people doing game development in Rust
+- [#rust-bots][bots_irc] notifcations about Rust from a selection of bots
+
+[rust_irc]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust
+[rustc_irc]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rustc 
+[libs_irc]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-libs
+[tools_irc]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-tools
+[lang_irc]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-lang
+[community_irc]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-community
+[internals_irc]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-internals
+[gamedev_irc]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-gamedev
+[crypto_irc]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-crypto
+[osdev_irc]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-osdev
+[webdev_irc]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-webdev
+[cargo_irc]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23cargo
+[offtopic_irc]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-offtopic
+[servo_irc]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23servo
+[bots_irc]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-bots
+
+### Discussion Forums
+
+We have two forums for asynchronous discussion:
+
+- The [Users Forum][users_forum], a space for asking questions, posting code
+  snippets, talking about Rust projects, and so on.
+
+- The [Internals Forum][internals_forum], a space dedicated to design and
+  implementation discussion about Rust itself (which includes Cargo, the
+  standard library, and other core bits of infrastructure).
+
+[users_forum]: https://users.rust-lang.org/
+[internals_forum]: https://internals.rust-lang.org/
+
+### Stack Overflow
+
+[Stack Overflow][stack_overflow] is a question and answer site for programmers.
+The Rust community is fairly active on the site, so searching for your problem
+might reveal someone who has asked it before.
+
+[stack_overflow]: https://stackoverflow.com/questions/tagged/rust
+
+## User Groups and Meetups
+
+There are more than 50 [Rust User Groups][user_group] worldwide in over 20
+countries totaling over 7,000 members. Rustaceans meet periodically in Rust User
+Groups. Its a great introduction to the community and a great way to learn and
+socialize with other people with a similar interest. Meetings are
+usually held monthly and very informal. Meetings are open to everyone.
+
+There's a global [calendar][calendar] for keeping up with Rust events.
+
+[user_group]: ./user_groups.html
+[calendar]: https://www.google.com/calendar/embed?src=apd9vmbc22egenmtu5l6c5jbfc@group.calendar.google.com
+
+## The Teams
+
+Rust has a community-driven development process where most decisions are made
+through open discussion and consensus, under the stewardship of various
+[teams][teams]:
+
+* The [Core Team][core_team] is responsible for steering the design and
+development process, overseeing the introduction of new features, and ultimately
+making decisions for which there is no consensus (this happens rarely).
+
+* The [Language Design Team][language_team] is responsible for the
+  design of new language features.
+
+* The [Library Team][library_team] is responsible for the Rust standard
+library, rust-lang crates, and conventions.
+
+* The [Compiler Team][compiler_team] is responsible for compiler internals and
+optimizations.
+
+* The [Tooling and Infrastructure Team][tool_team] is responsible for official
+tools like Cargo, multirust, rustfmt, as well as the CI Infrastructure for the
+project.
+
+* The [Community Team][community_team] is responsible for coordinating events,
+outreach, commercial users, teaching materials, and exposure.
+
+* The [Moderation Team][mod_team] is responsible for helping to uphold the
+[code of conduct][coc].
+
+In addition to the official team rosters, most teams also have a larger set
+of reviewers who are knowledgeable about the area and can sign off on
+code. If you're interested in getting involved in one of these teams,
+feel free to reach out to the team leader or any other member, who can
+help get you started.
+
+If you are not sure where to direct an enquiry, the best starting point
+would be the [community team][community_team].
+
+[teams]: https://www.rust-lang.org/team.html
+[core_team]: https://www.rust-lang.org/team.html#Core
+[language_team]: https://www.rust-lang.org/team.html#Language-design
+[library_team]: https://www.rust-lang.org/team.html#Library
+[compiler_team]: https://www.rust-lang.org/team.html#Compiler
+[tool_team]: https://www.rust-lang.org/team.html#Tooling-and-infrastructure
+[community_team]: https://www.rust-lang.org/team.html#Community
+[mod_team]: https://www.rust-lang.org/team.html#Moderation
+
+## Rust Development
+
+Rust has had over [1,200 different contributors][authors], a number that grows
+every single week. We'd love for you to join that list! If you aren't sure what
+to work on or how to get started, take a look at our
+[how to contribute][contribute] page.
+
+As mentioned above, the [Rust Internals Forum][internals_forum] is dedicated to
+discussing the design and implementation of Rust. A lot of discussion also
+happens on Github:
+
+- The [main repository][github] and [issue tracker][issue_tracking] are the
+  front lines of the implementation work. Our reviewers strive to be friendly
+  and to help mentor newcomers, so don't hesitate to open a pull request!
+
+- The [RFC repo][rfcs] tracks our Request for Comment process, the main pathway
+  through which the Rust community and the teams reach consensus on new
+  features proposed for the language and official libraries and tools.
+
+Roughly weekly, the Rust teams produce [team reports][team_reports] tracking
+team business, including the progression of proposals through the RFC and
+implementation process.
+
+[authors]: https://github.com/rust-lang/rust/blob/master/AUTHORS.txt
+[contribute]: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md
+[github]: https://github.com/rust-lang/rust
+[rfcs]: https://github.com/rust-lang/rfcs
+[team_reports]: https://github.com/rust-lang/subteams
+[issue_tracking]: https://github.com/rust-lang/rust/issues
diff --git a/user_groups.md b/user_groups.md
new file mode 100644
index 000000000..e1fa9e588
--- /dev/null
+++ b/user_groups.md
@@ -0,0 +1,160 @@
+---
+layout: default
+title: User Groups
+---
+
+There are more than 50 Rust User Groups worldwide in over 20 countries
+with over 7,000 members. Rustaceans meet periodically in Rust User
+Groups.  Its a great introduction to the community and a great way to
+learn and socialize with other people with a similar interest.
+Meetings are usually informal and open to
+everyone. If you have started a new user group and with to add it to
+this list, please contact the [Rust Community
+Team](./team.html#Community) or
+even better, open a pull request against
+[this website](https://github.com/rust-lang/rust-www/blob/master/user_groups.md).
+
+### Australia
+
+[Rust Melbourne](http://www.meetup.com/Rust-Melbourne/), Melbourne.
+
+[Rust Sydney](http://www.meetup.com/Rust-Sydney/), Sydney.
+
+### Austria
+
+[Klagenfurt Rust Programmers](http://www.meetup.com/Klagenfurt-Rust/), Klagenfurt.
+
+### Brazil
+
+[Rust São Paulo](http://www.meetup.com/Rust-Sao-Paulo-Meetup/), São Paulo.
+
+### Canada
+
+[Montréal Rust Language Meetup](http://www.meetup.com/Montreal-Rust-Language-Meetup/), Montréal, QC.
+
+[Rust Toronto](http://www.meetup.com/Rust-Toronto/), Toronto.
+
+### France
+
+[Lille Rust Meetup](http://www.meetup.com/rust-lille/), Lille.
+
+[Rust Paris](http://www.meetup.com/Rust-Paris/), Paris.
+
+### Germany
+
+[Rust Cologne/Bonn User Group](http://www.meetup.com/Rust-Cologne-Bonn/), Köln.
+
+[Rust Berlin](http://www.meetup.com/Rust-Berlin/), Berlin.
+
+[Rust Meetup Hamburg](http://www.meetup.com/Rust-Meetup-Hamburg/), Hamburg.
+
+[Rust Munich](http://www.meetup.com/rust-munich/), München.
+
+### India
+
+
+[Hyderabad Rust Meetup](http://www.meetup.com/Hyderabad-Rust-Meetup/), Hyderabad.
+
+[Rust Group Bangalore](https://www.facebook.com/groups/RustBLR/1579069959026339/), Bangalore.
+
+### Indonesia
+
+[Lambda Jakarta](http://www.meetup.com/Lambda-Jakarta/), Jakarta.
+
+### Ireland
+
+[Rust Dublin](http://www.meetup.com/Rust-Dublin/), Dublin.
+
+### Italy
+
+[Rust lang Milano](http://www.meetup.com/Rust-lang-Milano/), Milano.
+
+### Japan
+
+[Rust Of Us](https://rust-of-us.doorkeeper.jp/), Akihabara, Tokyo.
+
+[Rust Mokumoku Kai](https://rust.doorkeeper.jp/), Roppongi, Tokyo.
+
+[Akasaka Rust](https://akasaka-rust.doorkeeper.jp/), Akasaka, Tokyo.
+
+### Mexico
+
+[Rust Lang Comunidad Mexico](http://www.meetup.com/rustlangmx/), Guadalajara.
+
+### Netherlands
+
+[Rust Amsterdam](http://www.meetup.com/Rust-Amsterdam/), Amsterdam.
+
+### New Zealand
+
+[Wellington Rust Meetup](http://www.meetup.com/Wellington-Rust-Meetup/), Wellington.
+
+### Phillipines
+
+[Cebu Rust Camp](http://www.meetup.com/Cebu-Rust-Camp/), Cebu.
+
+### Poland
+
+[Rust Warsaw](http://www.meetup.com/Rust-Warsaw/), Warsaw.
+
+### Singapore
+
+[Singapore Rust Meetup](http://www.meetup.com/Singapore-Rust-Meetup/), Singapore.
+
+### Spain
+
+[Rust Madrid](http://www.meetup.com/Rust-Madrid/), Madrid.
+
+### South Korea
+
+[Rust Seoul](http://www.meetup.com/Rust-Seoul/), Seoul.
+
+### Sweden
+
+[Rust Skåne](http://www.meetup.com/rust-skane/), Lund.
+
+### Switzerland
+
+[Rust Romandie](http://www.meetup.com/rust-romandie/), Genève.
+
+[Rust Zurich](http://www.meetup.com/Rust-Zurich/), Zürich.
+
+### UK
+
+[Rust London User Group](http://www.meetup.com/Rust-London-User-Group/), London.
+
+### Uruguay
+
+[Rust Montevideo](http://www.meetup.com/Rust-Montevideo/), Montevideo.
+
+### USA
+
+[The Austin Rust Meetup](http://www.meetup.com/Austin-Rust-Meetup/), Austin.
+
+[Chicago Rust Meetup](http://www.meetup.com/Chicago-Rust-Meetup/), Chicago, IL.
+
+[Columbus Rust Society](http://www.meetup.com/columbus-rs/), Columbus, OH.
+
+[Desert Rust](http://www.meetup.com/Desert-Rustaceans/), Phoenix, AZ.
+
+[PDXRust](http://www.meetup.com/PDXRust/), Portland, OR.
+
+[Rust Bay Area](http://www.meetup.com/Rust-Bay-Area/), San Francisco, CA.
+
+[Rust Boston](http://www.meetup.com/Boston-Rust-Meetup-25317522aNpHwZdw/), Boston, MA.
+
+[Rust Boulder/Denver](http://www.meetup.com/Rust-Boulder-Denver/), Boulder, CO.
+
+[Rust Detroit](http://www.meetup.com/rust-detroit/), Detroit, MI.
+
+[Rust Learning Group](http://www.meetup.com/Rust-Learning-Group/), Oakland, CA.
+
+[Rust Los Angeles](http://www.meetup.com/Rust-Los-Angeles/), Los Angeles, CA.
+
+[Rust NYC](http://www.meetup.com/Rust-NYC/), New York, NY
+
+[Rust Twin Cities](http://www.meetup.com/Rust-TC/), Minneapolis, MN.
+
+[San Diego Rust](http://www.meetup.com/San-Diego-Rust/), San Diego, CA.
+
+[Seattle Rust Meetup](http://www.meetup.com/Seattle-Rust-Meetup/), Seattle, WA.