diff --git a/src/main/kotlin/com/cultureamp/eventsourcing/Configuration.kt b/src/main/kotlin/com/cultureamp/eventsourcing/Configuration.kt
index 8f790bb..7939a15 100644
--- a/src/main/kotlin/com/cultureamp/eventsourcing/Configuration.kt
+++ b/src/main/kotlin/com/cultureamp/eventsourcing/Configuration.kt
@@ -13,6 +13,12 @@ data class Configuration<CreationCmd : CreationCommand, CreationEvt : CreationEv
         val updated: Agg.(UpdateEvt) -> Agg,
         val aggregateType: Agg.() -> String
 ) {
+    object Builder {
+        inline fun <reified CreationCmd : CreationCommand, CreationEvt : CreationEvent, CmdErr : CommandError>create(noinline create: (CreationCmd) -> Either<CmdErr, CreationEvt>): CreateBuilder<CreationCmd, CreationEvt, CmdErr> {
+            return CreateBuilder(CreationCmd::class, create)
+        }
+    }
+
     companion object {
 
         inline fun <reified CreationCmd : CreationCommand, CreationEvt : CreationEvent, CmdErr : CommandError, reified UpdateCmd : UpdateCommand, UpdateEvt : UpdateEvent, reified Agg : Aggregate> from(
@@ -92,4 +98,44 @@ data class Configuration<CreationCmd : CreationCommand, CreationEvt : CreationEv
 
     private fun updated(initial: Agg, updateEvents: List<UpdateEvt>): Agg =
             updateEvents.fold(initial) { aggregate, updateEvent -> updated(aggregate, updateEvent) }
+}
+
+
+class CreateBuilder<CreationCmd : CreationCommand, CreationEvt : CreationEvent, CmdErr : CommandError>(
+        val creationCommandClass: KClass<CreationCmd>,
+        val create: (CreationCmd) -> Either<CmdErr, CreationEvt>
+) {
+    inline fun <Agg : Aggregate, reified UpdateCmd : UpdateCommand, UpdateEvt : UpdateEvent> update(noinline update: Agg.(UpdateCmd) -> Either<CmdErr, List<UpdateEvt>>) = UpdateBuilder(creationCommandClass, UpdateCmd::class, create, update)
+}
+
+class UpdateBuilder<CreationCmd : CreationCommand, CreationEvt : CreationEvent, CmdErr : CommandError, UpdateCmd : UpdateCommand, UpdateEvt : UpdateEvent, Agg : Aggregate>(
+        private val creationCommandClass: KClass<CreationCmd>,
+        private val updateCommandClass: KClass<UpdateCmd>,
+        private val create: (CreationCmd) -> Either<CmdErr, CreationEvt>,
+        private val update: Agg.(UpdateCmd) -> Either<CmdErr, List<UpdateEvt>>
+) {
+    fun created(created: (CreationEvt) -> Agg) = CreatedBuilder(creationCommandClass, updateCommandClass, create, update, created)
+    fun buildStateless(instance: Agg, aggregateType: Agg.() -> String = { this::class.simpleName!! }) = UpdatedBuilder(creationCommandClass, updateCommandClass, create, update, { instance }, { instance }).build(aggregateType)
+}
+
+class CreatedBuilder<CreationCmd : CreationCommand, CreationEvt : CreationEvent, CmdErr : CommandError, UpdateCmd : UpdateCommand, UpdateEvt : UpdateEvent, Agg : Aggregate>(
+        private val creationCommandClass: KClass<CreationCmd>,
+        private val updateCommandClass: KClass<UpdateCmd>,
+        private val create: (CreationCmd) -> Either<CmdErr, CreationEvt>,
+        private val update: Agg.(UpdateCmd) -> Either<CmdErr, List<UpdateEvt>>,
+        private val created: (CreationEvt) -> Agg) {
+    fun updated(updated: Agg.(UpdateEvt) -> Agg) = UpdatedBuilder(creationCommandClass, updateCommandClass, create, update, created, updated)
+    fun build() = UpdatedBuilder(creationCommandClass, updateCommandClass, create, update, created, { _ -> this }).build()
+}
+
+class UpdatedBuilder<CreationCmd : CreationCommand, CreationEvt : CreationEvent, CmdErr : CommandError, UpdateCmd : UpdateCommand, UpdateEvt : UpdateEvent, Agg : Aggregate>(
+        private val creationCommandClass: KClass<CreationCmd>,
+        private val updateCommandClass: KClass<UpdateCmd>,
+        private val create: (CreationCmd) -> Either<CmdErr, CreationEvt>,
+        private val update: Agg.(UpdateCmd) -> Either<CmdErr, List<UpdateEvt>>,
+        private val created: (CreationEvt) -> Agg,
+        private val updated: Agg.(UpdateEvt) -> Agg
+) {
+    fun build(aggregateType: Agg.() -> String = { this::class.simpleName!! }) = Configuration(creationCommandClass, updateCommandClass, create, update, created, updated, aggregateType)
+
 }
\ No newline at end of file