diff --git a/public/images/pages/mining-sm.svg b/public/images/pages/mining-sm.svg
index 3ad8d2be..47b8c9ae 100644
--- a/public/images/pages/mining-sm.svg
+++ b/public/images/pages/mining-sm.svg
@@ -1,10 +1,14 @@
diff --git a/public/images/pages/mining.svg b/public/images/pages/mining.svg
index f19961f9..baa0b6f4 100644
--- a/public/images/pages/mining.svg
+++ b/public/images/pages/mining.svg
@@ -1,5 +1,8 @@
diff --git a/public/images/pages/testnet-sm.svg b/public/images/pages/testnet-sm.svg
new file mode 100644
index 00000000..3ad8d2be
--- /dev/null
+++ b/public/images/pages/testnet-sm.svg
@@ -0,0 +1,10 @@
+
diff --git a/public/images/pages/testnet.svg b/public/images/pages/testnet.svg
new file mode 100644
index 00000000..f19961f9
--- /dev/null
+++ b/public/images/pages/testnet.svg
@@ -0,0 +1,5 @@
+
diff --git a/src/common/navigation.yaml b/src/common/navigation.yaml
index a60c8268..ddf79697 100644
--- a/src/common/navigation.yaml
+++ b/src/common/navigation.yaml
@@ -45,7 +45,7 @@ sections:
- path: /stacks-blockchain
pages:
- path: /overview
- - path: /testnet
+ - path: /testnet-node
- path: /best-practices
- path: /wire-format
- path: /atlas
diff --git a/src/pages/index.md b/src/pages/index.md
index 173fcf9b..e42b702c 100644
--- a/src/pages/index.md
+++ b/src/pages/index.md
@@ -18,4 +18,4 @@ description: All you need to build decentralized apps and smart contracts.
## Explore
[@page-reference | grid-small]
-| /ecosystem/overview, /ecosystem/stacks-token, /stacks-blockchain/testnet
+| /ecosystem/overview, /ecosystem/stacks-token, /stacks-blockchain/testnet-node
diff --git a/src/pages/mining.md b/src/pages/mining.md
index 27011761..9968acd9 100644
--- a/src/pages/mining.md
+++ b/src/pages/mining.md
@@ -4,6 +4,8 @@ description: Set up and run a miner on the Stacks 2.0 testnet
icon: TestnetIcon
experience: beginners
duration: 10 minutes
+tags:
+ - tutorial
images:
large: /images/pages/mining.svg
sm: /images/pages/mining-sm.svg
@@ -14,7 +16,7 @@ images:
Make sure you've followed our guide for getting a Stacks 2.0 Testnet node up and running, once completed it's only a few more steps to run a proof-of-burn miner on the testnet.
[@page-reference | inline]
-| /stacks-blockchain/testnet
+| /stacks-blockchain/testnet-node
## Running a miner
diff --git a/src/pages/stacks-blockchain/overview.md b/src/pages/stacks-blockchain/overview.md
index 3b26fc2d..69fac202 100644
--- a/src/pages/stacks-blockchain/overview.md
+++ b/src/pages/stacks-blockchain/overview.md
@@ -1,5 +1,96 @@
---
title: Overview
+description: Help build the user owned internet by testing the latest builds for Stacks nodes, Stacks mining, Clarity smart contracts, and more.
---
## Introduction
+
+Stacks 2.0 is an open-membership replicated state machine produced by the coordination of a non-enumerable set of peers.
+
+To unpack this definition:
+
+- A replicated state machine is two or more copies (“replicas”) of a given set of rules (a “machine”) that, in processing
+ a common input (such as the same sequence of transactions), will arrive at the same configuration (“state”). Bitcoin
+ is a replicated state machine — its state is the set of UTXOs, which each peer has a full copy of, and given a block,
+ all peers will independently calculate the same new UTXO set from the existing one.
+- Open-membership means that any host on the Internet can join the blockchain and independently calculate the same full
+ replica as all other peers.
+- Non-enumerable means that the set of peers that are producing the blocks don’t know about one another — they don’t know
+ their identities, or even how many exist and are online. They are indistinguishable.
+
+## Roadmap
+
+Stacks improvement proposals (SIPs) are aimed at describing the implementation of the Stacks blockchain, as well as
+proposing improvements. They should contain concise technical specifications of features or standards and the rationale
+behind it. SIPs are intended to be the primary medium for proposing new features, for collecting community input on a
+system-wide issue, and for documenting design decisions.
+
+-> See [SIP 000](https://github.com/blockstack/stacks-blockchain/blob/master/sip/sip-000-stacks-improvement-proposal-process.md) for more details about the SIPs process.
+
+- ✅ [SIP 001: Burn Election](https://github.com/blockstack/stacks-blockchain/blob/master/sip/sip-001-burn-election.md)
+- ✅ [SIP 002: Clarity, a language for predictable smart contracts](https://github.com/blockstack/stacks-blockchain/blob/master/sip/sip-002-smart-contract-language.md)
+- ✅ [SIP 003: Peer Network](https://github.com/blockstack/stacks-blockchain/blob/master/sip/sip-003-peer-network.md)
+- ✅ [SIP 004: Cryptographic Committment to Materialized Views](https://github.com/blockstack/stacks-blockchain/blob/master/sip/sip-004-materialized-view.md)
+- ✅ [SIP 005: Blocks, Transactions, and Accounts](https://github.com/blockstack/stacks-blockchain/blob/master/sip/sip-005-blocks-and-transactions.md)
+- [ ] SIP 006: Clarity Execution Cost Assessment (Q2 2020)
+- [ ] SIP 007: Stacking Consensus (Q2 2020)
+
+## Testnet phases
+
+- ✅ **Helium** is a developer local setup, mono-node, assembling SIP 001, SIP 002, SIP 004 and SIP 005. With this version, developers can not only run Stacks 2.0 on their development machines, but also write, execute, and test smart contracts. See the instructions below for more details.
+- [ ] **Neon** is the upcoming version of our public testnet, that we're anticipating will ship in Q2 2020. This testnet will ship with SIP 003, and will be an open-membership public network, where participants will be able to validate and participate in mining testnet blocks.
+- [ ] **Mainnet** is the fully functional version, that we're intending to ship in Q3 2020.
+
+## Features
+
+✅ Live features Upcoming
+
+| | Phase 1 | **Phase 2** | Phase 3 | Phase 4 |
+| -------------------------------------------------------------------------------------------------------------------------------------------- | ------- | ----------- | ---------------------------------- | ---------------------------------- |
+| [Simple Proof of Transfer mining](https://github.com/blockstack/stacks-blockchain) | ✅ | ✅ | | |
+| [Send and receive STX](https://github.com/blockstack/cli-blockstack) | ✅ | ✅ | | |
+| [Deploy Clarity contracts](https://docs.blockstack.org/core/smart/overview.html) | ✅ | ✅ | | |
+| [New Stacks Explorer](https://testnet-explorer.blockstack.org/) | | ✅ | | |
+| [stacks-transactions-js](https://github.com/blockstack/stacks-transactions-js) | | ✅ | | |
+| [Transaction signing](https://blog.blockstack.org/build-apps-that-sign-transactions-with-clarity-smart-contracts-on-the-stacks-2-0-testnet/) | | ✅ | | |
+| Proof of Transfer mining | | | | |
+| Stacking | | | | |
+| New Stacks Wallet | | | | |
+| Testing upgrade to Stacks 2.0 | | | | |
+| Integration with Bitcoin testnet | | | | |
+
+## Stacks 2.0 features
+
+### Clarity Smart Contracts
+
+A Smart Contract is code running on the Stacks Blockchain that executes autonomously. When your Smart Contract has no
+room for errors, Clarity is here to help. Clarity is the safest language for writing Smart Contracts, optimized for
+predictability and security.
+
+[@page-reference | inline]
+| /smart-contracts/overview
+
+### STX Mining
+
+Anyone can be a Stacks Miner. There are no special hardware or software requirements, all you need is Bitcoin. Instead
+of spending energy, Stacks miners transfer Bitcoin to holders of Stacks Token (STX) to mine a block. This mechanism is
+called Proof of Transfer (PoX).
+
+[@page-reference | inline]
+| /stacks-blockchain/testnet-node
+
+[@page-reference | inline]
+| /mining
+
+### Proof of Transfer (PoX)
+
+Proof of Transfer (PoX) is the consensus mechanism that leverages the security and stability of Bitcoin to create new
+blockchains, without modifying the Bitcoin protocol. PoX makes it possible to reward network participants with Bitcoin.
+An example of this is Stacking.
+
+### Stacking
+
+Stackers are Stacks (STX) Token holders who provide a valuable service to the network by locking up their STX for a certain
+period of time. As a reward, Stackers receive the Bitcoin that miners transfer as part of Proof of Transfer (PoX).
+
+-> Proof of Transfer and Stacking are in active development and are coming soon
diff --git a/src/pages/stacks-blockchain/testnet.md b/src/pages/stacks-blockchain/testnet-node.md
similarity index 97%
rename from src/pages/stacks-blockchain/testnet.md
rename to src/pages/stacks-blockchain/testnet-node.md
index 9df1a6e2..0cfdf83e 100644
--- a/src/pages/stacks-blockchain/testnet.md
+++ b/src/pages/stacks-blockchain/testnet-node.md
@@ -7,8 +7,8 @@ experience: beginners
tags:
- tutorial
images:
- large: /images/pages/mining.svg
- sm: /images/pages/mining-sm.svg
+ large: /images/pages/testnet.svg
+ sm: /images/pages/testnet-sm.svg
---
## Introduction