diff --git a/lib/build.gradle b/lib/build.gradle
index 4a63f46..7f1d170 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -7,7 +7,7 @@ apply plugin: 'kotlin-multiplatform'
 archivesBaseName = 'redux-kotlin-reselect'
 
 group 'org.reduxkotlin'
-version '0.2.5'
+version '0.2.7'
 
 kotlin {
     jvm()
diff --git a/lib/src/commonMain/kotlin/org/reduxkotlin/reselect.kt b/lib/src/commonMain/kotlin/org/reduxkotlin/Reselect.kt
similarity index 99%
rename from lib/src/commonMain/kotlin/org/reduxkotlin/reselect.kt
rename to lib/src/commonMain/kotlin/org/reduxkotlin/Reselect.kt
index f49c7a8..ec9a5da 100644
--- a/lib/src/commonMain/kotlin/org/reduxkotlin/reselect.kt
+++ b/lib/src/commonMain/kotlin/org/reduxkotlin/Reselect.kt
@@ -138,6 +138,10 @@ fun <S,O> S.whenChangeOf(selector: Selector<S, O>, blockfn: (O) -> Unit) {
  * abstract base class for all selectors
  */
 abstract class AbstractSelector<S, O> : Selector<S, O> {
+    fun invoke(tmp: ()-> Unit): O {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
     @JvmField protected var recomputationsLastChanged = 0L
     @JvmField protected var _recomputations = 0L
     override val recomputations: Long get() = _recomputations
diff --git a/lib/src/commonMain/kotlin/org/reduxkotlin/SelectorSubscriberBuilder.kt b/lib/src/commonMain/kotlin/org/reduxkotlin/SelectorSubscriberBuilder.kt
new file mode 100644
index 0000000..6dbedc5
--- /dev/null
+++ b/lib/src/commonMain/kotlin/org/reduxkotlin/SelectorSubscriberBuilder.kt
@@ -0,0 +1,52 @@
+package org.reduxkotlin
+
+
+/**
+ * A Selector Subscriber - group of selectors that subscribe to store state changes.
+ *
+ * @param State is the type of the state object returned by the store.
+ * @property store The redux store
+ * @constructor creates an empty SelectorSubscriberBuilder
+ */
+class SelectorSubscriberBuilder<State : Any>(val store: Store) {
+
+    private val selectorList = mutableMapOf<Selector<State, Any>, (Any) -> Unit>()
+
+    //state is here to make available to lambda with receiver in DSL
+    val state: State
+        get() = store.getState() as State
+
+    var withAnyChangeFun: (() -> Unit)? = null
+
+    fun withAnyChange(f: () -> Unit) {
+        withAnyChangeFun = f
+    }
+
+
+    fun withSingleField(selector: (State) -> Any, action: (Any) -> Unit) {
+        val selBuilder = SelectorBuilder<State>()
+        val sel = selBuilder.withSingleField(selector)
+        selectorList[sel] = action
+    }
+
+    infix fun SelectorSubscriberBuilder<State>.select(selector: (State) -> Any): AbstractSelector<State, Any> =
+            SelectorBuilder<State>().withSingleField(selector)
+
+    infix fun SelectorSubscriberBuilder<State>.on(selector: (State) -> Any): AbstractSelector<State, Any> =
+            SelectorBuilder<State>().withSingleField(selector)
+
+    operator fun (() -> Any).unaryPlus(): AbstractSelector<State, Any> {
+        val that = this
+        return SelectorBuilder<State>().withSingleField { that() }
+    }
+
+    infix fun AbstractSelector<State, Any>.then(action: (Any) -> Unit) {
+        selectorList[this] = action
+    }
+
+    infix operator fun AbstractSelector<State, Any>.plus(action: (Any) -> Unit) {
+        selectorList[this] = action
+    }
+}
+
+
diff --git a/lib/src/commonMain/kotlin/org/reduxkotlin/builders.kt b/lib/src/commonMain/kotlin/org/reduxkotlin/builders.kt
deleted file mode 100644
index 9728ff3..0000000
--- a/lib/src/commonMain/kotlin/org/reduxkotlin/builders.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.reduxkotlin
-
-class SelectorSubscriberBuilder<S : Any>(val store: Store) {
-    val state: S
-        get() = store.getState() as S
-
-    var withAnyChangeFun: (() -> Unit)? = null
-
-    fun withAnyChange(f: () -> Unit) {
-        withAnyChangeFun = f
-    }
-
-    val selectorList = mutableMapOf<Selector<S, Any>, (Any) -> Unit>()
-    fun withSingleField(selector: (S) -> Any, action: (Any) -> Unit) {
-        val selBuilder = SelectorBuilder<S>()
-        val sel = selBuilder.withSingleField(selector)
-        selectorList[sel] = action
-    }
-}
-
-/**
- * Helper function that creates a DSL for subscribing to changes in specific state fields and actions to take.
- * Inside the lambda there is access to the current state through the var `state`
- *
- * ex:
- *      SelectorSubscriberFn {
- *          withSingleField({it.foo}, { actionWhenFooChanges() }
- *
- *          withAnyChange {
- *              //called whenever any change happens to state
- *              view.setMessage(state.barMsg) //state is current state
- *          }
- *      }
- */
-fun <S : Any> SelectorSubscriberFn(store: Store, selectorSubscriberBuilderInit: SelectorSubscriberBuilder<S>.() -> Unit): StoreSubscriber {
-    val subBuilder = SelectorSubscriberBuilder<S>(store)
-    subBuilder.selectorSubscriberBuilderInit()
-    return {
-        subBuilder.selectorList.forEach { entry ->
-            entry.key.onChangeIn(store.getState() as S) { entry.value(store.getState()) }
-        }
-        subBuilder.withAnyChangeFun?.invoke()
-    }
-}
diff --git a/settings.gradle b/settings.gradle
index 388f24c..9950823 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -9,7 +9,7 @@ pluginManagement {
 }
 
 include ':lib'
-rootProject.name='Redux-Kotlin-thunk'
+rootProject.name='Redux-Kotlin-reselect'
 
 
 rootProject.name = 'test'