diff --git a/CHIPs/chip-0001.md b/CHIPs/chip-0001.md
index a0827dd6..32c70fea 100644
--- a/CHIPs/chip-0001.md
+++ b/CHIPs/chip-0001.md
@@ -4,7 +4,7 @@ Title        | CHia Improvement Proposal (CHIP) process
 Description  | A living document to outline the CHIP process, from Idea to Final.
 Author       | [Daniel Perry](https://github.com/danieljperry)
 Comments-URI | https://github.com/Chia-Network/chips/wiki/Comments:CHIP-0001
-Status       | Draft
+Status       | Living
 Category     | Process
 Sub-Category | Procedural
 Created      | 2021-11-24
@@ -55,7 +55,7 @@ A CHIP is a formal design document. It uses a standard format, which will be lai
 
 Each of these CHIP categories will be discussed in more detail in the next section.
 
-Some proposals, including (but not limited to) patches to particular pieces of software and certain additions to existing code, do not require a CHIP. Some good questions to ask while deciding whether to write a CHIP:
+Most ideas to improve Chia should _not_ be CHIPs. For example, some proposals, including (but not limited to) patches to particular pieces of software and certain additions to existing code, do not require a CHIP. Some good questions to ask while deciding whether to write a CHIP:
 
 * If my proposal is implemented, will it require standardization between multiple projects?
 * Will my proposal affect Chia's community or ecosystem in general (as opposed to only affecting one small part of it)?
@@ -232,8 +232,14 @@ The CHIP's _Comments-URI_ field will be the official location for the community
 Additionally, informal reviews and comments are welcome in the #dev channel of Chia's [Keybase](https://keybase.io/team/chia_network.public "Chia's Keybase forum") forum. These comments will receive significantly less moderation. In fact, we encourage you to use this forum to introduce yourself to the community.
 
 ### CHIP editors
-The current CHIP Editors are:
-[TODO]
+
+Name              | Keybase Handle                                       | GitHub Profile 
+:-----------------|:-----------------------------------------------------|:--------------
+Bram Cohen        | [@bramcohen](https://keybase.io/bramcohen)           | [bramcohen](https://github.com/bramcohen)
+Gene Hoffman, Jr. | [@hoffmang](https://keybase.io/hoffmang)             | [hoffmang9](https://github.com/hoffmang9)
+Paul Hainsworth   | [@paulhainsworth](https://keybase.io/paulhainsworth) | [paulhainsworth-chia](https://github.com/paulhainsworth-chia)
+Dan Perry         | [@dan_perry](https://keybase.io/dan_perry)           | [danieljperry](https://github.com/danieljperry)
+Freddie Coleman   | [@fcoleman](https://keybase.io/fcoleman)             | [freddiecoleman](https://github.com/freddiecoleman)
 
 ### CHIP Editor responsibilities and workflow
 When a pull request is created for a new CHIP, an Editor must review the template for:
diff --git a/README.md b/README.md
index 431febff..ef5a70bb 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ This repository contains a list of improvements related to Chia. The complete pr
 The rest of this document will contain a summary of all notable CHIPs, organized by status.
 
 ### Draft
-* [chip001](/CHIPs/chip-0001.md) -- CHia Improvement Proposal (CHIP) process
+* None
 
 ### Review
 * None
@@ -30,7 +30,7 @@ The rest of this document will contain a summary of all notable CHIPs, organized
 * None
 
 ### Living
-* None
+* [chip001](/CHIPs/chip-0001.md) -- CHia Improvement Proposal (CHIP) process
 
 -----
 
diff --git a/chip-template.md b/chip-template.md
index e40b626c..9008f10a 100644
--- a/chip-template.md
+++ b/chip-template.md
@@ -2,9 +2,9 @@ CHIP Number   | < Creator must leave this blank. Editor will assign a number.>
 :-------------|:----
 Title         | <Keep succinct. Maximum 44 characters.>
 Description   | <A short, single-sentence description of this CHIP. Maximum 140 characters.>
-Author        | <Name, along with email or GitHub address, of each author, separated by a comma.>
+Author        | <Name, along with Keybase handle or GitHub address, of each author, separated by a comma.>
 Comments-URI  | < Creator must leave this blank. Editor will assign a URI.>
-Status        | <Idea \| Draft \| Review \| Review (Fast Track) \| Last Call \| Final \| Stagnant \| Withdrawn \| Obsolete \| Living>
+Status        | < Creator must leave this blank. Editor will assign a status.>
 Category      | <Standards Track \| Process \| Informational>
 Sub-Category  | < Add according to Category>
 Created       | <Date created, using yyyy-mm-dd format (ISO 8601)>