diff --git a/TODO.md b/TODO.md
index 06664e9..1663a0a 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,52 +1,31 @@
 # TODO
 
 Here will be kept all of the various todos for this project, organized by release.
+N.b. that v0.3.0 was skipped because of such a fundamental change in the usage of the
+program with the incorporation of Groowt and Web View Components.
 
-## 0.4.2
+## 0.6.0
+- [ ] Plugin system for build scripts
+
+## 0.5.0
+- [ ] watch/dev mode and server
+- [ ] Reorganize gradle project layout so there is less hunting around for files
+
+## 0.4.3
 - [ ] `Text` component for simply rendering Text objects. Can be used as such:
 ```
 <Text path='/SomeText.md' />
 <Text name='SomeText.md' />
 <Text text={text} />
 ```
+- [ ] `TextContainer` for accessing all found texts
+- [ ] `ModelFactory` for creating models, and `TextModelFactory` for creating models from texts.
+- [ ] `Model` component for rendering a model with either a supplied renderer, or a registered `ModelRenderer`
+- [ ] `Global` component for rendering globals.
 
 ## 0.4.1
 - [x] Update groowt to 0.1.2.
 
-## Future
-
-### Add
-- [ ] Plan out plugin system such that we can create custom providers of texts, data, etc.
-- [ ] Add `Watchable` interface/trait back; an abstraction over FS watching and other sources (such as a database, etc.).
-- [ ] Explore `apply(Plugin)` in buildScripts.
-
-### Fix
-
-## v0.2.0
-
-### Add
-- [ ] Write manual.
-- [x] Remove `lib` module.
-- [x] Add a way for CLI to choose a build to do, or multiple builds, defaulting to 'default' if it exists.
-  - [ ] Still must work on 'default'-ing.
-- [x] Write lots of tests for buildscript dsl, etc.
-- [x] Explore `base` in buildScript dsl.
-  - Get rid of `allBuilds` concept, and replace it with composable/concat-able builds. In the dsl we could have a notion of `abstractBuild` which can be 'extended' (i.e., on the left side of a concat operation) but not actually run (since it doesn't have a name).
-  - `OutputDir` should be concat-able, such that the left is the *base* for the right.
-  - `OutputDirFunctions.concat` should be concat-able as well, such that both are `BiFunction<OutputDir, Build, OutputDir>`, and the output of the left is the input of the right. 
-  - Make the delegates as dumb as possible; no more `getResult` methods; make different classes/object handle concat'ing and getting results.
-- [x] Provide a way to override `ssgBuilds` variables from the cli.
-
-### Fix
-- [ ] Update CHANGELOG to reflect the gsp-dsl changes.
-  - [ ] `taskTypes` gone, use class name instead
-  - [ ] introduction of `models`
-- [x] Change most instances of `Closure<Void>` to `Closure<?>` to help with IDE expectations.
-- [ ] Fix auto-imports in build script so we don't need to import things.
-- [x] Re-introduce input/output concept to tasks, if possible
-
-## Finished
-
 ### v0.2.0
 - [x] Investigate imports, including static, in scripts
   - Does not work; must use binding