diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31073e33..11e82ef7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+# 0.0.30
+
+## PiMonitor Client SDK Core
+
+- [[PM121]](https://github.com/picortex/bitframe/issues/121) Persist the currently logged in Monitor
+- [[PM142]](https://github.com/picortex/bitframe/issues/142) Refactor SignUpService to just use one method for signing up
+- [[PM123]](https://github.com/picortex/bitframe/issues/123) Moved the sing in/up event into the event bus
+- [[PM151]](https://github.com/picortex/bitframe/issues/151) Automatically sign in user after registration
+
+## Bitframe
+
+- [[BF143]](https://github.com/picortex/bitframe/issues/143) Response is not properly returning the cause of an error
+
+## Bitframe Server
+
+- [[BF144]](https://github.com/picortex/bitframe/issues/144) Fix Cross Origin Resource Sharing Issue
+
 # 0.0.29
 
 ## PiMonitor Client SDK Core
diff --git a/bitframe-authentication/core/src/commonMain/kotlin/bitframe/authentication/signin/Session.kt b/bitframe-authentication/core/src/commonMain/kotlin/bitframe/authentication/signin/Session.kt
index 4729bdc6..46acc2c0 100644
--- a/bitframe-authentication/core/src/commonMain/kotlin/bitframe/authentication/signin/Session.kt
+++ b/bitframe-authentication/core/src/commonMain/kotlin/bitframe/authentication/signin/Session.kt
@@ -10,21 +10,21 @@ import kotlin.js.JsExport
 sealed class Session {
     object Unknown : Session()
 
-    class SignedIn(
+    data class SignedIn(
         val app: App,
         val space: Space,
-        val user: User,
+        val user: User
     ) : Session()
 
-    class Conundrum(
+    data class Conundrum(
         val app: App,
         val spaces: List<Space>,
         val user: User
     ) : Session()
 
-    class SignedOut(
+    data class SignedOut(
         val app: App,
         val space: Space?,
-        val user: User?,
+        val user: User?
     ) : Session()
 }
\ No newline at end of file
diff --git a/bitframe-authentication/core/src/commonMain/kotlin/bitframe/authentication/users/Contacts.kt b/bitframe-authentication/core/src/commonMain/kotlin/bitframe/authentication/users/Contacts.kt
index 06ec359e..dd9a3b13 100644
--- a/bitframe-authentication/core/src/commonMain/kotlin/bitframe/authentication/users/Contacts.kt
+++ b/bitframe-authentication/core/src/commonMain/kotlin/bitframe/authentication/users/Contacts.kt
@@ -122,15 +122,24 @@ sealed class Contacts {
         }
     }
 
+    /**
+     * Returns a [Set] of all contacts in their string representation
+     */
+    fun mapEachToString() = when (this) {
+        None -> emptySet()
+        is Email -> setOf(email.value)
+        is Emails -> emails.map { it.value }.toSet()
+        is Phone -> setOf(phone.value)
+        is Phones -> phones.map { it.value }.toSet()
+        is EmailPhone -> setOf(email.value, phone.value)
+        is Mixed -> (emails.map { it.value } + phones.map { it.value }).toSet()
+    }
+
+    @Deprecated("In favour of mapToString().first())", replaceWith = ReplaceWith("mapToString().first()"))
     fun firstValue() = firstValueOrNull() ?: throw RuntimeException("There are no Contacts inside the contacts container")
 
-    fun firstValueOrNull() = when (this) {
-        None -> null
-        is Email -> email.value
-        is Emails -> emails.firstOrNull()?.value
-        is Phone -> phone.value
-        is Phones -> phones.firstOrNull()?.value
-        is EmailPhone -> email.value
-        is Mixed -> emails.firstOrNull()?.value
-    }
+    @Deprecated("In favour of mapToString().firstOrNull()", replaceWith = ReplaceWith("mapToString().firstOrNull()"))
+    fun firstValueOrNull() = mapEachToString().firstOrNull()
+
+    fun contains(value: String) = mapEachToString().contains(value.lowercase())
 }
\ No newline at end of file
diff --git a/bitframe-authentication/core/src/commonMain/kotlin/bitframe/authentication/users/UserRef.kt b/bitframe-authentication/core/src/commonMain/kotlin/bitframe/authentication/users/UserRef.kt
index 72375017..b8304ba0 100644
--- a/bitframe-authentication/core/src/commonMain/kotlin/bitframe/authentication/users/UserRef.kt
+++ b/bitframe-authentication/core/src/commonMain/kotlin/bitframe/authentication/users/UserRef.kt
@@ -6,7 +6,7 @@ import kotlinx.serialization.Serializable
 import kotlin.js.JsExport
 
 @Serializable
-class UserRef(
+data class UserRef(
     val uid: String,
     val name: String,
     val tag: String,
diff --git a/bitframe-authentication/services/core/build.gradle.kts b/bitframe-authentication/services/core/build.gradle.kts
index 3b31f885..49745c13 100644
--- a/bitframe-authentication/services/core/build.gradle.kts
+++ b/bitframe-authentication/services/core/build.gradle.kts
@@ -14,6 +14,7 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 api(project(":bitframe-service-core"))
+                api(project(":bitframe-events-core"))
                 api(project(":bitframe-authentication-dao-core"))
                 api(asoft("live-core", vers.asoft.live))
                 api(asoft("later-ktx", vers.asoft.later))
diff --git a/bitframe-authentication/services/core/src/commonMain/kotlin/bitframe/authentication/signin/SignInService.kt b/bitframe-authentication/services/core/src/commonMain/kotlin/bitframe/authentication/signin/SignInService.kt
index a7a85d40..8de4cb41 100644
--- a/bitframe-authentication/services/core/src/commonMain/kotlin/bitframe/authentication/signin/SignInService.kt
+++ b/bitframe-authentication/services/core/src/commonMain/kotlin/bitframe/authentication/signin/SignInService.kt
@@ -1,20 +1,30 @@
-@file:JsExport
-
 package bitframe.authentication.signin
 
+import bitframe.authentication.apps.App
 import bitframe.authentication.spaces.Space
 import bitframe.authentication.users.User
+import bitframe.events.Event
+import bitframe.events.EventBus
+import bitframe.service.config.ServiceConfig
 import later.Later
+import later.await
+import later.later
 import live.Live
 import kotlin.js.JsExport
-import kotlin.jvm.JvmField
-import kotlin.jvm.JvmStatic
 
-abstract class SignInService {
+abstract class SignInService(
+    open val bus: EventBus,
+    open val config: ServiceConfig
+) {
+    val session: Live<Session> = Live(Session.Unknown)
+    val currentSession get() = session.value
+    protected val scope get() = config.scope
+
     companion object {
-        val session: Live<Session> = Live(Session.Unknown)
+        const val SIGN_IN_EVENT_ID = "bitframe.authentication.sign.in"
+        const val SIGN_OUT_EVENT_ID = "bitframe.authentication.sign.out"
 
-        val current get() = session.value
+        fun signInEvent(session: Session.SignedIn) = Event(SIGN_IN_EVENT_ID, session)
     }
 
     fun validate(credentials: SignInCredentials) {
@@ -22,12 +32,44 @@ abstract class SignInService {
         require(credentials.password.isNotEmpty()) { "Password must not be empty" }
     }
 
-    abstract fun signIn(credentials: SignInCredentials): Later<LoginConundrum>
+    /**
+     * Do not call this method directly. Call [signIn] instead
+     */
+    protected abstract fun executeSignIn(credentials: SignInCredentials): Later<LoginConundrum>
+
+    fun signIn(credentials: SignInCredentials): Later<LoginConundrum> = scope.later {
+        validate(credentials)
+        val conundrum = executeSignIn(credentials).await()
+        if (conundrum.spaces.size == 1) {
+            val (user, spaces) = conundrum
+            val s = Session.SignedIn(App(config.appId), spaces.first(), user)
+            session.value = s
+            bus.dispatch(signInEvent(s))
+        }
+        conundrum
+    }
 
     /**
      * Resolve a [LoginConundrum] by specifying which [Space] a user currently wants to log in
      *
      * This method should only be called when [signIn] returned a conundrum with at least two [LoginConundrum.spaces]
      */
-    abstract fun resolve(space: Space): Later<Session.SignedIn>
+    fun resolve(space: Space): Later<Session.SignedIn> = scope.later {
+        val error = IllegalStateException(
+            """
+                You are attempting to resolve a non exiting conundrum,
+                
+                Make sure you have tried to signIn and the result obtained was a LoginConundrum with more that one space
+                """.trimIndent()
+        )
+        when (val s = session.value) {
+            Session.Unknown -> throw error
+            is Session.SignedIn -> Session.SignedIn(App(config.appId), space, s.user)
+            is Session.Conundrum -> Session.SignedIn(App(config.appId), space, s.user)
+            is Session.SignedOut -> throw error
+        }.also {
+            session.value = it
+            bus.dispatch(signInEvent(it))
+        }
+    }
 }
\ No newline at end of file
diff --git a/bitframe-authentication/services/core/src/commonMain/kotlin/bitframe/authentication/signin/SignInServiceImpl.kt b/bitframe-authentication/services/core/src/commonMain/kotlin/bitframe/authentication/signin/SignInServiceImpl.kt
index 8781bd24..b505fd7f 100644
--- a/bitframe-authentication/services/core/src/commonMain/kotlin/bitframe/authentication/signin/SignInServiceImpl.kt
+++ b/bitframe-authentication/services/core/src/commonMain/kotlin/bitframe/authentication/signin/SignInServiceImpl.kt
@@ -4,23 +4,24 @@ import bitframe.authentication.AuthenticationDaoProvider
 import bitframe.authentication.apps.App
 import bitframe.authentication.spaces.Space
 import bitframe.authentication.spaces.SpacesDao
+import bitframe.authentication.users.User
 import bitframe.authentication.users.UsersDao
 import bitframe.daos.conditions.contains
+import bitframe.events.EventBus
 import bitframe.service.config.ServiceConfig
 import later.Later
 import later.await
 import later.later
 
-class SignInServiceImpl(
+open class SignInServiceImpl(
     private val usersDao: UsersDao,
     private val spacesDao: SpacesDao,
-    private val config: ServiceConfig
-) : SignInService() {
-    constructor(provider: AuthenticationDaoProvider, config: ServiceConfig) : this(provider.users, provider.spaces, config)
+    override val config: ServiceConfig,
+    override val bus: EventBus
+) : SignInService(bus, config) {
+    constructor(provider: AuthenticationDaoProvider, config: ServiceConfig, bus: EventBus) : this(provider.users, provider.spaces, config, bus)
 
-    private val scope = config.scope
-    override fun signIn(credentials: SignInCredentials): Later<LoginConundrum> = scope.later {
-        validate(credentials)
+    override fun executeSignIn(credentials: SignInCredentials): Later<LoginConundrum> = scope.later {
         val matches = usersDao.all(where = "contacts" contains credentials.alias).await()
         if (matches.isEmpty()) throw RuntimeException("User with loginId=${credentials.alias}, not found")
         val match = matches.first()
@@ -35,20 +36,4 @@ class SignInServiceImpl(
             }
         }
     }
-
-    override fun resolve(space: Space): Later<Session.SignedIn> = scope.later {
-        val error = IllegalStateException(
-            """
-                You are attempting to resolve a non exiting conundrum,
-                
-                Make sure you have tried to signIn and the result obtained was a LoginConundrum with more that one space
-                """.trimIndent()
-        )
-        when (val s = session.value) {
-            Session.Unknown -> throw error
-            is Session.SignedIn -> Session.SignedIn(App(config.appId), space, s.user)
-            is Session.Conundrum -> Session.SignedIn(App(config.appId), space, s.user)
-            is Session.SignedOut -> throw error
-        }.also { session.value = it }
-    }
 }
\ No newline at end of file
diff --git a/bitframe-authentication/services/ktor/src/commonMain/kotlin/bitframe/authentication/signin/SignInServiceKtor.kt b/bitframe-authentication/services/ktor/src/commonMain/kotlin/bitframe/authentication/signin/SignInServiceKtor.kt
index b0f61f14..d8c11f6b 100644
--- a/bitframe-authentication/services/ktor/src/commonMain/kotlin/bitframe/authentication/signin/SignInServiceKtor.kt
+++ b/bitframe-authentication/services/ktor/src/commonMain/kotlin/bitframe/authentication/signin/SignInServiceKtor.kt
@@ -1,48 +1,29 @@
 package bitframe.authentication.signin
 
-import bitframe.authentication.apps.App
-import bitframe.authentication.spaces.Space
+import bitframe.events.EventBus
 import bitframe.response.response.decodeResponseFromString
 import bitframe.service.MiniService
 import bitframe.service.config.KtorClientConfiguration
+import bitframe.service.utils.JsonContent
+import io.ktor.client.features.*
 import io.ktor.client.request.*
-import io.ktor.content.*
-import io.ktor.http.*
+import io.ktor.client.statement.*
 import kotlinx.serialization.json.Json
 import later.Later
 import later.later
-import kotlin.jvm.JvmOverloads
 
-class SignInServiceKtor @JvmOverloads constructor(
-    override val config: KtorClientConfiguration
-) : SignInService(), MiniService {
-    private val path = config.url + "/api/authentication/sign-in"
-    private val http = config.http
-    private val scope = config.scope
-    override fun signIn(credentials: SignInCredentials): Later<LoginConundrum> = scope.later {
-        validate(credentials)
-        val json = http.post<String>(path) {
-            body = TextContent(
-                text = Json.encodeToString(SignInCredentials.serializer(), credentials),
-                contentType = ContentType.Application.Json
-            )
+open class SignInServiceKtor(
+    override val config: KtorClientConfiguration,
+    override val bus: EventBus
+) : SignInService(bus, config), MiniService {
+    private val path get() = config.url + "/api/authentication/sign-in"
+    private val http get() = config.http
+    override fun executeSignIn(credentials: SignInCredentials): Later<LoginConundrum> = scope.later {
+        val resp = try {
+            http.post(path) { body = JsonContent(credentials) }
+        } catch (exp: ClientRequestException) {
+            exp.response
         }
-        Json.decodeResponseFromString(LoginConundrum.serializer(), json).response()
-    }
-
-    override fun resolve(space: Space): Later<Session.SignedIn> = scope.later {
-        val error = IllegalStateException(
-            """
-                You are attempting to resolve a non exiting conundrum,
-                
-                Make sure you have tried to signIn and the result obtained was a LoginConundrum with more that one space
-                """.trimIndent()
-        )
-        when (val s = session.value) {
-            Session.Unknown -> throw error
-            is Session.SignedIn -> Session.SignedIn(App(config.appId), space, s.user)
-            is Session.Conundrum -> Session.SignedIn(App(config.appId), space, s.user)
-            is Session.SignedOut -> throw error
-        }.also { session.value = it }
+        Json.decodeResponseFromString(LoginConundrum.serializer(), resp.readText()).response()
     }
 }
\ No newline at end of file
diff --git a/bitframe-authentication/services/test/build.gradle.kts b/bitframe-authentication/services/test/build.gradle.kts
index 815b53f8..8ac4debb 100644
--- a/bitframe-authentication/services/test/build.gradle.kts
+++ b/bitframe-authentication/services/test/build.gradle.kts
@@ -21,12 +21,7 @@ kotlin {
                 api(asoft("expect-coroutines", vers.asoft.expect))
                 api(project(":bitframe-authentication-dao-inmemory"))
                 api(project(":pi-monitor-test-testing"))
-            }
-        }
-
-        val jvmMain by getting {
-            dependencies {
-
+                api(project(":bitframe-events-inmemory"))
             }
         }
     }
diff --git a/bitframe-authentication/services/test/src/commonMain/kotlin/bitframe/authentication/signin/SignInServiceTest.kt b/bitframe-authentication/services/test/src/commonMain/kotlin/bitframe/authentication/signin/SignInServiceTest.kt
index 8bac09b6..2bb5e667 100644
--- a/bitframe-authentication/services/test/src/commonMain/kotlin/bitframe/authentication/signin/SignInServiceTest.kt
+++ b/bitframe-authentication/services/test/src/commonMain/kotlin/bitframe/authentication/signin/SignInServiceTest.kt
@@ -1,8 +1,7 @@
 package bitframe.authentication.signin
 
 import bitframe.authentication.InMemoryAuthenticationDaoProvider
-import bitframe.authentication.spaces.SpacesDaoInMemory
-import bitframe.authentication.users.UsersDaoInMemory
+import bitframe.events.InMemoryEventBus
 import bitframe.service.config.KtorClientConfiguration
 import expect.expect
 import expect.expectFailure
@@ -19,9 +18,10 @@ import kotlin.test.Test
 open class SignInServiceTest : IntegrationTest() {
     val provider = InMemoryAuthenticationDaoProvider()
     open val service: SignInService by lazy {
+        val bus = InMemoryEventBus()
         when (val cfg = config) {
-            is KtorClientConfiguration -> SignInServiceKtor(cfg)
-            else -> SignInServiceImpl(provider, cfg)
+            is KtorClientConfiguration -> SignInServiceKtor(cfg, bus)
+            else -> SignInServiceImpl(provider, cfg, bus)
         }
     }
 
diff --git a/bitframe-authentication/services/test/src/commonTest/kotlin/integration/SignInServiceIntegrationTest.kt b/bitframe-authentication/services/test/src/commonTest/kotlin/integration/SignInServiceIntegrationTest.kt
index e25ac5cf..250546bd 100644
--- a/bitframe-authentication/services/test/src/commonTest/kotlin/integration/SignInServiceIntegrationTest.kt
+++ b/bitframe-authentication/services/test/src/commonTest/kotlin/integration/SignInServiceIntegrationTest.kt
@@ -5,15 +5,17 @@ import bitframe.authentication.signin.SignInService
 import bitframe.authentication.signin.SignInServiceImpl
 import bitframe.authentication.signin.SignInServiceKtor
 import bitframe.authentication.signin.SignInServiceTest
+import bitframe.events.InMemoryEventBus
 import bitframe.service.config.KtorClientConfiguration
 import expect.expect
 import kotlin.test.Test
 
 class SignInServiceIntegrationTest : SignInServiceTest() {
     override val service: SignInService by lazy {
+        val bus = InMemoryEventBus()
         when (val cfg = config) {
-            is KtorClientConfiguration -> SignInServiceKtor(cfg)
-            else -> SignInServiceImpl(InMemoryAuthenticationDaoProvider(), cfg)
+            is KtorClientConfiguration -> SignInServiceKtor(cfg, bus)
+            else -> SignInServiceImpl(InMemoryAuthenticationDaoProvider(), cfg, bus)
         }
     }
 
diff --git a/bitframe-authentication/services/test/src/commonTest/kotlin/unit/SignInServiceUnitTest.kt b/bitframe-authentication/services/test/src/commonTest/kotlin/unit/SignInServiceUnitTest.kt
index 4747323a..200641d6 100644
--- a/bitframe-authentication/services/test/src/commonTest/kotlin/unit/SignInServiceUnitTest.kt
+++ b/bitframe-authentication/services/test/src/commonTest/kotlin/unit/SignInServiceUnitTest.kt
@@ -7,6 +7,7 @@ import bitframe.authentication.signin.SignInServiceKtor
 import bitframe.authentication.signin.SignInServiceTest
 import bitframe.authentication.spaces.SpacesDaoInMemory
 import bitframe.authentication.users.UsersDaoInMemory
+import bitframe.events.InMemoryEventBus
 import bitframe.service.config.KtorClientConfiguration
 import bitframe.service.config.ServiceConfig
 import expect.expect
@@ -16,7 +17,11 @@ import kotlin.test.Test
 
 class SignInServiceUnitTest : SignInServiceTest() {
     override val service: SignInService by lazy {
-        SignInServiceImpl(InMemoryAuthenticationDaoProvider(), ServiceConfig(APP_ID))
+        SignInServiceImpl(
+            provider = InMemoryAuthenticationDaoProvider(),
+            config = ServiceConfig(APP_ID),
+            bus = InMemoryEventBus()
+        )
     }
 
     @Test
diff --git a/bitframe-client/sdks/ktor/src/commonMain/kotlin/bitframe/BitframeKtorClient.kt b/bitframe-client/sdks/ktor/src/commonMain/kotlin/bitframe/BitframeKtorClient.kt
index 26cc8607..64e55504 100644
--- a/bitframe-client/sdks/ktor/src/commonMain/kotlin/bitframe/BitframeKtorClient.kt
+++ b/bitframe-client/sdks/ktor/src/commonMain/kotlin/bitframe/BitframeKtorClient.kt
@@ -3,13 +3,15 @@ package bitframe
 import bitframe.authentication.signin.SignInService
 import bitframe.authentication.signin.SignInServiceKtor
 import bitframe.authentication.users.UsersService
+import bitframe.events.EventBus
 import bitframe.service.config.KtorClientConfiguration
 import kotlin.js.JsExport
 
 @JsExport
 open class BitframeKtorClient(
+    val bus: EventBus,
     val config: KtorClientConfiguration
 ) : BitframeService {
     override val users: UsersService get() = TODO("Not yet implemented")
-    override val signIn: SignInService = SignInServiceKtor(config)
+    override val signIn: SignInService = SignInServiceKtor(config, bus)
 }
\ No newline at end of file
diff --git a/bitframe-client/sdks/test/src/commonMain/kotlin/bitframe/BitframeTestClient.kt b/bitframe-client/sdks/test/src/commonMain/kotlin/bitframe/BitframeTestClient.kt
index 2743aa71..8a716e39 100644
--- a/bitframe-client/sdks/test/src/commonMain/kotlin/bitframe/BitframeTestClient.kt
+++ b/bitframe-client/sdks/test/src/commonMain/kotlin/bitframe/BitframeTestClient.kt
@@ -3,6 +3,7 @@ package bitframe
 import bitframe.authentication.TestClientConfiguration
 import bitframe.authentication.signin.SignInService
 import bitframe.authentication.users.UsersService
+import bitframe.events.EventBus
 import kotlin.jvm.JvmStatic
 import kotlin.jvm.JvmSynthetic
 
@@ -14,16 +15,17 @@ interface BitframeTestClient : BitframeService {
 
         @JvmSynthetic
         operator fun invoke(
-            configuration: TestClientConfiguration = CONFIGURATION
+            configuration: TestClientConfiguration = CONFIGURATION,
+            bus: EventBus
         ): BitframeTestClient = cachedClients.getOrPut(configuration.appId) {
-            BitframeTestClientImpl(configuration)
+            BitframeTestClientImpl(bus, configuration)
         }
 
         @JvmStatic
-        fun with(configuration: TestClientConfiguration) = invoke(configuration)
+        fun with(configuration: TestClientConfiguration, bus: EventBus) = invoke(configuration, bus)
 
         @JvmStatic
-        fun getDefault() = invoke(CONFIGURATION)
+        fun getDefault(bus: EventBus) = invoke(CONFIGURATION, bus)
     }
 
     override val signIn: SignInService
diff --git a/bitframe-client/sdks/test/src/commonMain/kotlin/bitframe/BitframeTestClientImpl.kt b/bitframe-client/sdks/test/src/commonMain/kotlin/bitframe/BitframeTestClientImpl.kt
index 93a72fcc..767d3dc9 100644
--- a/bitframe-client/sdks/test/src/commonMain/kotlin/bitframe/BitframeTestClientImpl.kt
+++ b/bitframe-client/sdks/test/src/commonMain/kotlin/bitframe/BitframeTestClientImpl.kt
@@ -7,8 +7,10 @@ import bitframe.authentication.spaces.Space
 import bitframe.authentication.spaces.SpacesDao
 import bitframe.authentication.spaces.SpacesDaoInMemory
 import bitframe.authentication.users.*
+import bitframe.events.EventBus
 
 open class BitframeTestClientImpl(
+    private val bus: EventBus,
     private val config: TestClientConfiguration,
     usersDao: UsersDao = UsersDaoInMemory(config = config.toDaoConfig(), users = testUsers()),
     spacesDao: SpacesDao = SpacesDaoInMemory(config = config.toDaoConfig(), spaces = testSpaces())
@@ -45,6 +47,6 @@ open class BitframeTestClientImpl(
         )
     }
 
-    override val signIn: SignInService = SignInServiceImpl(usersDao, spacesDao, config)
+    override val signIn: SignInService = SignInServiceImpl(usersDao, spacesDao, config, bus)
     override val users: UsersService = UsersServiceImpl(usersDao, spacesDao, config)
 }
\ No newline at end of file
diff --git a/bitframe-client/ui/react/src/main/kotlin/bitframe/Bitframe.kt b/bitframe-client/ui/react/src/main/kotlin/bitframe/Bitframe.kt
index 9c437bda..7ff2d305 100644
--- a/bitframe-client/ui/react/src/main/kotlin/bitframe/Bitframe.kt
+++ b/bitframe-client/ui/react/src/main/kotlin/bitframe/Bitframe.kt
@@ -10,10 +10,10 @@ import react.router.dom.route
 import react.router.dom.switch
 import styled.styledDiv
 
-internal const val SignInPageRoute = "/authentication/sign-in/"
-internal const val SignUpPageRoute = "/authentication/sign-up/"
-internal const val PanelPageRoute = "/panel"
-internal const val HomeRoute = "/"
+const val SignInPageRoute = "/authentication/sign-in/"
+const val SignUpPageRoute = "/authentication/sign-up/"
+const val PanelPageRoute = "/panel"
+const val HomeRoute = "/"
 
 private fun defaultRenderers(
     client: BitframeService,
@@ -21,7 +21,7 @@ private fun defaultRenderers(
     version: String
 ): Map<String, Renderer> = mapOf(
     SignInPageRoute to { SignInPage(client.signIn, version) },
-    PanelPageRoute to { Panel(moduleRenderers) },
+    PanelPageRoute to { Panel(client,moduleRenderers) },
     HomeRoute to { LandingPage(version) }
 )
 
diff --git a/bitframe-client/ui/react/src/main/kotlin/bitframe/panel/Drawer.kt b/bitframe-client/ui/react/src/main/kotlin/bitframe/panel/Drawer.kt
index cdd64329..c54e083e 100644
--- a/bitframe-client/ui/react/src/main/kotlin/bitframe/panel/Drawer.kt
+++ b/bitframe-client/ui/react/src/main/kotlin/bitframe/panel/Drawer.kt
@@ -15,7 +15,7 @@ internal fun RBuilder.Drawer(
     header = {
         CompanyHeader(
             logoPath = "https://res.cloudinary.com/dc3mzhqp1/image/upload/v1597218653/PiLogos/logo_2x_eema7k.png",
-            userName = (SignInService.current as? Session.SignedIn)?.user?.name ?: "Unknown User"
+            userName = (state.session as? Session.SignedIn)?.user?.name ?: "Unknown User"
         )
     }
 )
diff --git a/bitframe-client/ui/react/src/main/kotlin/bitframe/panel/Main.kt b/bitframe-client/ui/react/src/main/kotlin/bitframe/panel/Main.kt
index fb265f1c..287d7ac2 100644
--- a/bitframe-client/ui/react/src/main/kotlin/bitframe/panel/Main.kt
+++ b/bitframe-client/ui/react/src/main/kotlin/bitframe/panel/Main.kt
@@ -1,5 +1,6 @@
 package bitframe.panel
 
+import bitframe.BitframeService
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.css.em
 import react.Props
@@ -21,18 +22,19 @@ private external interface PanelProps : Props {
 
 private val Panel = fc<PanelProps> { props ->
     val controller = props.controller
+    val service = props.scope.service.signIn
     when (val state = useViewModelState(props.scope.viewModel)) {
         is PanelState.Loading -> LoadingBox(state.message, 80)
         is PanelState.Panel -> NavigationDrawer(
             drawerState = controller,
             drawer = { Drawer(controller, state) },
-            content = { Body(controller,props.moduleRenderers) }
+            content = { Body(controller, props.moduleRenderers) }
         )
     }
 }
 
-fun RBuilder.Panel(moduleRenderers: Map<String, Renderer>) = child(Panel) {
+fun RBuilder.Panel(client: BitframeService, moduleRenderers: Map<String, Renderer>) = child(Panel) {
     attrs.controller = MutableStateFlow(DrawerState.Opened)
     attrs.moduleRenderers = moduleRenderers
-    attrs.scope = PanelScope()
+    attrs.scope = PanelScope(client)
 }
\ No newline at end of file
diff --git a/bitframe-client/viewmodels/build.gradle.kts b/bitframe-client/viewmodels/build.gradle.kts
index f8895544..1c274b17 100644
--- a/bitframe-client/viewmodels/build.gradle.kts
+++ b/bitframe-client/viewmodels/build.gradle.kts
@@ -20,8 +20,15 @@ kotlin {
         val commonTest by getting {
             dependencies {
                 api(project(":bitframe-client-sdk-test"))
+                api(project(":bitframe-events-inmemory"))
                 api(asoft("viewmodel-test-expect", vers.asoft.viewmodel))
             }
         }
+
+        val jsMain by getting {
+            dependencies {
+                api(project(":bitframe-events-react"))
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/bitframe-client/viewmodels/src/commonMain/kotlin/bitframe/panel/PanelState.kt b/bitframe-client/viewmodels/src/commonMain/kotlin/bitframe/panel/PanelState.kt
index 80f497c2..a211237d 100644
--- a/bitframe-client/viewmodels/src/commonMain/kotlin/bitframe/panel/PanelState.kt
+++ b/bitframe-client/viewmodels/src/commonMain/kotlin/bitframe/panel/PanelState.kt
@@ -2,12 +2,14 @@
 
 package bitframe.panel
 
+import bitframe.authentication.signin.Session
 import kotlin.js.JsExport
 import kotlin.js.JsName
 
 sealed class PanelState {
     data class Loading(val message: String) : PanelState()
     data class Panel(
+        val session: Session,
         @JsName("moduleList")
         val modules: List<UIModuleGroup>
     ) : PanelState() {
diff --git a/bitframe-client/viewmodels/src/commonMain/kotlin/bitframe/panel/PanelViewModel.kt b/bitframe-client/viewmodels/src/commonMain/kotlin/bitframe/panel/PanelViewModel.kt
index 7cd77290..2d95ac01 100644
--- a/bitframe-client/viewmodels/src/commonMain/kotlin/bitframe/panel/PanelViewModel.kt
+++ b/bitframe-client/viewmodels/src/commonMain/kotlin/bitframe/panel/PanelViewModel.kt
@@ -2,6 +2,7 @@
 
 package bitframe.panel
 
+import bitframe.BitframeService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -10,11 +11,14 @@ import kotlin.js.JsExport
 import bitframe.panel.PanelIntent as Intent
 import bitframe.panel.PanelState as State
 
-class PanelViewModel : ViewModel<Intent, State>(State.Loading("Setting up your workspace")) {
+class PanelViewModel(
+    val service: BitframeService
+) : ViewModel<Intent, State>(State.Loading("Setting up your workspace")) {
     init {
         coroutineScope.launch {
             delay(500)
             ui.value = State.Panel(
+                service.signIn.session.value,
                 listOf(
                     UIModuleGroup(
                         "Evaluation", listOf(
diff --git a/bitframe-client/viewmodels/src/commonTest/kotlin/unit/authentication/signin/SignInViewModelTest.kt b/bitframe-client/viewmodels/src/commonTest/kotlin/unit/authentication/signin/SignInViewModelTest.kt
index a54ff947..7769398a 100644
--- a/bitframe-client/viewmodels/src/commonTest/kotlin/unit/authentication/signin/SignInViewModelTest.kt
+++ b/bitframe-client/viewmodels/src/commonTest/kotlin/unit/authentication/signin/SignInViewModelTest.kt
@@ -3,6 +3,7 @@ package unit.authentication.signin
 import bitframe.BitframeTestClientImpl
 import bitframe.authentication.TestClientConfiguration
 import bitframe.authentication.signin.*
+import bitframe.events.InMemoryEventBus
 import bitframe.presenters.feedbacks.FormFeedback.Loading
 import bitframe.presenters.feedbacks.FormFeedback.Success
 import expect.expect
@@ -12,7 +13,8 @@ import viewmodel.expect
 import kotlin.test.Test
 
 class SignInViewModelTest {
-    private val service = BitframeTestClientImpl(TestClientConfiguration.of("app-id"))
+    val bus = InMemoryEventBus()
+    private val service = BitframeTestClientImpl(bus, TestClientConfiguration.of("app-id"))
     private val vm = SignInViewModel(service.signIn)
 
     @Test
diff --git a/bitframe-client/viewmodels/src/commonTest/kotlin/unit/authentication/signin/legacy/SignInViewModelTest.kt b/bitframe-client/viewmodels/src/commonTest/kotlin/unit/authentication/signin/legacy/SignInViewModelTest.kt
index f755b1e2..5255fb14 100644
--- a/bitframe-client/viewmodels/src/commonTest/kotlin/unit/authentication/signin/legacy/SignInViewModelTest.kt
+++ b/bitframe-client/viewmodels/src/commonTest/kotlin/unit/authentication/signin/legacy/SignInViewModelTest.kt
@@ -7,6 +7,7 @@ import bitframe.authentication.signin.SignInFormFields
 import bitframe.authentication.signin.legacy.SignInIntent.ShowForm
 import bitframe.authentication.signin.legacy.SignInIntent.Submit
 import bitframe.authentication.signin.legacy.SignInViewModel
+import bitframe.events.InMemoryEventBus
 import expect.expect
 import expect.toBe
 import kotlinx.coroutines.runTest
@@ -15,7 +16,8 @@ import kotlin.test.Test
 import bitframe.authentication.signin.legacy.SignInState as State
 
 class SignInViewModelTest {
-    private val service = BitframeTestClientImpl(TestClientConfiguration.of("app-id"))
+    val bus = InMemoryEventBus()
+    private val service = BitframeTestClientImpl(bus, TestClientConfiguration.of("app-id"))
     private val vm = SignInViewModel(service.signIn)
 
     @Test
diff --git a/bitframe-client/viewmodels/src/jsMain/kotlin/bitframe/authentication/signin/exports/SignInScope.kt b/bitframe-client/viewmodels/src/jsMain/kotlin/bitframe/authentication/signin/exports/SignInScope.kt
index 3b8a1110..949f5ff8 100644
--- a/bitframe-client/viewmodels/src/jsMain/kotlin/bitframe/authentication/signin/exports/SignInScope.kt
+++ b/bitframe-client/viewmodels/src/jsMain/kotlin/bitframe/authentication/signin/exports/SignInScope.kt
@@ -3,9 +3,11 @@
 
 package bitframe.authentication.signin.exports
 
+import bitframe.authentication.signin.Session
 import bitframe.authentication.signin.SignInIntent
 import bitframe.authentication.signin.SignInService
 import bitframe.authentication.signin.SignInViewModel
+import useEventHandler
 
 class SignInScope(service: SignInService) {
 
@@ -14,4 +16,8 @@ class SignInScope(service: SignInService) {
     val submit = { cred: SignInCredentials ->
         viewModel.post(SignInIntent.Submit(cred.toSignInCredentials()))
     }
+
+    val useSignInEvent: (callback: (Session.SignedIn) -> Unit) -> Unit = {
+        useEventHandler(service.bus, SignInService.SIGN_IN_EVENT_ID, it)
+    }
 }
\ No newline at end of file
diff --git a/bitframe-client/viewmodels/src/jsMain/kotlin/bitframe/panel/PanelScope.kt b/bitframe-client/viewmodels/src/jsMain/kotlin/bitframe/panel/PanelScope.kt
index 3f3b3ead..4b4e4a16 100644
--- a/bitframe-client/viewmodels/src/jsMain/kotlin/bitframe/panel/PanelScope.kt
+++ b/bitframe-client/viewmodels/src/jsMain/kotlin/bitframe/panel/PanelScope.kt
@@ -2,6 +2,8 @@
 
 package bitframe.panel
 
-class PanelScope {
-    val viewModel = PanelViewModel()
+import bitframe.BitframeService
+
+class PanelScope(val service: BitframeService) {
+    val viewModel = PanelViewModel(service)
 }
\ No newline at end of file
diff --git a/bitframe-core/src/commonMain/kotlin/bitframe/response/Error.kt b/bitframe-core/src/commonMain/kotlin/bitframe/response/Error.kt
index 7457c901..94cb33b4 100644
--- a/bitframe-core/src/commonMain/kotlin/bitframe/response/Error.kt
+++ b/bitframe-core/src/commonMain/kotlin/bitframe/response/Error.kt
@@ -7,12 +7,15 @@ import kotlin.jvm.JvmOverloads
 data class Error(
     val message: String,
     val type: String,
-    val cause: String
+    val cause: String,
+    val stackTrace: String = ""
 ) {
+
     @JvmOverloads
     constructor(error: Throwable, message: String? = null) : this(
         message = message ?: error.message ?: "Unknown",
         type = error::class.simpleName ?: "Unknown",
-        cause = (if (message == null) error.cause?.message else error.message) ?: "Unknown"
+        cause = (if (message == null) error.cause?.message else error.message) ?: "Unknown",
+        stackTrace = error.stackTraceToString()
     )
 }
\ No newline at end of file
diff --git a/bitframe-core/src/commonMain/kotlin/bitframe/response/ResponseBuilder.kt b/bitframe-core/src/commonMain/kotlin/bitframe/response/ResponseBuilder.kt
index ce045d3f..042198d9 100644
--- a/bitframe-core/src/commonMain/kotlin/bitframe/response/ResponseBuilder.kt
+++ b/bitframe-core/src/commonMain/kotlin/bitframe/response/ResponseBuilder.kt
@@ -23,6 +23,8 @@ class ResponseBuilder<D, I> {
 
     fun badRequest(message: String): Nothing = reject(HttpStatusCode.BadRequest, Throwable(message))
 
+    fun reject(message: String): Nothing = badRequest(message)
+
     fun reject(code: HttpStatusCode, message: String): Nothing {
         val throwable = Throwable(message)
         failure = responseOf(Status(code), throwable)
diff --git a/bitframe-events/core/src/commonMain/kotlin/bitframe/events/Event.kt b/bitframe-events/core/src/commonMain/kotlin/bitframe/events/Event.kt
index f724927b..5e1d19b6 100644
--- a/bitframe-events/core/src/commonMain/kotlin/bitframe/events/Event.kt
+++ b/bitframe-events/core/src/commonMain/kotlin/bitframe/events/Event.kt
@@ -1,5 +1,9 @@
+@file:JsExport
+
 package bitframe.events
 
+import kotlin.js.JsExport
+
 open class Event<out D>(
     val id: String,
     val data: D
diff --git a/bitframe-events/react/build.gradle.kts b/bitframe-events/react/build.gradle.kts
new file mode 100644
index 00000000..cfe9fdf1
--- /dev/null
+++ b/bitframe-events/react/build.gradle.kts
@@ -0,0 +1,25 @@
+plugins {
+    kotlin("js")
+    kotlin("plugin.serialization")
+    id("tz.co.asoft.library")
+    id("org.jetbrains.dokka")
+}
+
+kotlin {
+    js(IR) { library() }
+
+    sourceSets {
+        val main by getting {
+            dependencies {
+                api(project(":bitframe-events-core"))
+                api(asoft("reakt-core", vers.asoft.reakt))
+            }
+        }
+
+        val test by getting {
+            dependencies {
+                implementation(asoft("expect-coroutines", vers.asoft.expect))
+            }
+        }
+    }
+}
diff --git a/bitframe-events/react/karma.config.d/timeout.js b/bitframe-events/react/karma.config.d/timeout.js
new file mode 100644
index 00000000..622dc29f
--- /dev/null
+++ b/bitframe-events/react/karma.config.d/timeout.js
@@ -0,0 +1,8 @@
+config.set({
+  "client": {
+    "mocha": {
+      "timeout": 10000
+    },
+  },
+  "browserDisconnectTimeout": 10000
+});
\ No newline at end of file
diff --git a/bitframe-events/react/src/main/kotlin/index.kt b/bitframe-events/react/src/main/kotlin/index.kt
new file mode 100644
index 00000000..681cfa48
--- /dev/null
+++ b/bitframe-events/react/src/main/kotlin/index.kt
@@ -0,0 +1,11 @@
+import bitframe.events.EventBus
+import react.useEffectOnce
+
+fun <D> useEventHandler(
+    bus: EventBus,
+    eventId: String,
+    callback: (D) -> Unit
+) = useEffectOnce {
+    val subscriber = bus.subscribe(eventId, callback)
+    cleanup { subscriber.unsubscribe() }
+}
\ No newline at end of file
diff --git a/bitframe-server/frameworks/core/build.gradle.kts b/bitframe-server/frameworks/core/build.gradle.kts
index 71233b33..c7124e03 100644
--- a/bitframe-server/frameworks/core/build.gradle.kts
+++ b/bitframe-server/frameworks/core/build.gradle.kts
@@ -28,6 +28,7 @@ kotlin {
             dependencies {
                 implementation(project(":bitframe-server-framework-test"))
                 implementation(project(":bitframe-server-dao-inmemory"))
+                implementation(project(":bitframe-events-inmemory"))
                 implementation(kotlinx("serialization-core", vers.kotlinx.serialization))
             }
         }
diff --git a/bitframe-server/frameworks/core/src/commonMain/kotlin/bitframe/server/modules/authentication/AuthenticationControllerImpl.kt b/bitframe-server/frameworks/core/src/commonMain/kotlin/bitframe/server/modules/authentication/AuthenticationControllerImpl.kt
index 606e4b96..45c314c1 100644
--- a/bitframe-server/frameworks/core/src/commonMain/kotlin/bitframe/server/modules/authentication/AuthenticationControllerImpl.kt
+++ b/bitframe-server/frameworks/core/src/commonMain/kotlin/bitframe/server/modules/authentication/AuthenticationControllerImpl.kt
@@ -14,7 +14,7 @@ class AuthenticationControllerImpl(
     override suspend fun signIn(body: String?): HttpResponse = response {
         val credentials = Json.decodeFromString(
             deserializer = SignInCredentials.serializer(),
-            string = body ?: throw IllegalArgumentException("A json body was not provided")
+            string = body ?: reject("A json body was not provided")
         )
         resolve(service.signIn.signIn(credentials).await(), HttpStatusCode.Accepted)
     }.toHttpResponse()
diff --git a/bitframe-server/frameworks/core/src/commonMain/kotlin/bitframe/server/modules/authentication/AuthenticationModuleImpl.kt b/bitframe-server/frameworks/core/src/commonMain/kotlin/bitframe/server/modules/authentication/AuthenticationModuleImpl.kt
index cc868289..022bf684 100644
--- a/bitframe-server/frameworks/core/src/commonMain/kotlin/bitframe/server/modules/authentication/AuthenticationModuleImpl.kt
+++ b/bitframe-server/frameworks/core/src/commonMain/kotlin/bitframe/server/modules/authentication/AuthenticationModuleImpl.kt
@@ -3,6 +3,7 @@ package bitframe.server.modules.authentication
 import bitframe.authentication.signin.Basic
 import bitframe.authentication.users.Contacts
 import bitframe.authentication.users.CreateUserParams
+import bitframe.events.EventBus
 import bitframe.server.actions.Action
 import bitframe.server.data.DAOProvider
 import bitframe.server.modules.authentication.signin.SignInAction
@@ -10,22 +11,25 @@ import bitframe.service.config.ServiceConfig
 import kotlin.jvm.JvmOverloads
 
 open class AuthenticationModuleImpl @JvmOverloads constructor(
+    private val bus: EventBus,
     private val controller: AuthenticationController,
     default: CreateUserParams = GENESIS
 ) : AuthenticationModule {
 
     @JvmOverloads
     constructor(
+        bus: EventBus,
         service: AuthenticationService,
         default: CreateUserParams = GENESIS
-    ) : this(AuthenticationControllerImpl(service), default)
+    ) : this(bus, AuthenticationControllerImpl(service), default)
 
     @JvmOverloads
     constructor(
         provider: DAOProvider,
         config: ServiceConfig,
+        bus: EventBus,
         default: CreateUserParams = GENESIS
-    ) : this(AuthenticationServiceImpl(provider.users, provider.spaces, config), default)
+    ) : this(bus, AuthenticationServiceImpl(bus, provider.users, provider.spaces, config), default)
 
     init {
         controller.service.users.createIfNotExist(default)
diff --git a/bitframe-server/frameworks/core/src/commonMain/kotlin/bitframe/server/modules/authentication/AuthenticationServiceImpl.kt b/bitframe-server/frameworks/core/src/commonMain/kotlin/bitframe/server/modules/authentication/AuthenticationServiceImpl.kt
index 52852b51..b791e389 100644
--- a/bitframe-server/frameworks/core/src/commonMain/kotlin/bitframe/server/modules/authentication/AuthenticationServiceImpl.kt
+++ b/bitframe-server/frameworks/core/src/commonMain/kotlin/bitframe/server/modules/authentication/AuthenticationServiceImpl.kt
@@ -6,15 +6,17 @@ import bitframe.authentication.spaces.SpacesDao
 import bitframe.authentication.users.UsersDao
 import bitframe.authentication.users.UsersService
 import bitframe.authentication.users.UsersServiceImpl
+import bitframe.events.EventBus
 import bitframe.server.data.DAOProvider
 import bitframe.service.config.ServiceConfig
 
 class AuthenticationServiceImpl(
+    val bus: EventBus,
     private val usersDao: UsersDao,
     private val spacesDao: SpacesDao,
     private val config: ServiceConfig,
-    override val signIn: SignInService = SignInServiceImpl(usersDao, spacesDao, config),
+    override val signIn: SignInService = SignInServiceImpl(usersDao, spacesDao, config, bus),
     override val users: UsersService = UsersServiceImpl(usersDao, spacesDao, config)
 ) : AuthenticationService {
-    constructor(provider: DAOProvider, config: ServiceConfig) : this(provider.users, provider.spaces, config)
+    constructor(provider: DAOProvider, config: ServiceConfig, bus: EventBus) : this(bus,provider.users, provider.spaces, config)
 }
\ No newline at end of file
diff --git a/bitframe-server/frameworks/core/src/commonTest/kotlin/integration/authentication/Utils.kt b/bitframe-server/frameworks/core/src/commonTest/kotlin/integration/authentication/Utils.kt
index c8bc2623..17eb3ce8 100644
--- a/bitframe-server/frameworks/core/src/commonTest/kotlin/integration/authentication/Utils.kt
+++ b/bitframe-server/frameworks/core/src/commonTest/kotlin/integration/authentication/Utils.kt
@@ -1,5 +1,6 @@
 package integration.authentication
 
+import bitframe.events.InMemoryEventBus
 import bitframe.server.InMemoryDaoProvider
 import bitframe.server.data.DAOProvider
 import bitframe.server.modules.authentication.AuthenticationControllerImpl
@@ -14,6 +15,8 @@ internal val SERVICE_CONFIG = ServiceConfig(
     "server-app"
 )
 
-internal val AUTHENTICATION_SERVICE_UNDER_TEST = AuthenticationServiceImpl(DAO_PROVIDER_UNDER_TEST, SERVICE_CONFIG)
+internal val BUS = InMemoryEventBus()
+
+internal val AUTHENTICATION_SERVICE_UNDER_TEST = AuthenticationServiceImpl(DAO_PROVIDER_UNDER_TEST, SERVICE_CONFIG, BUS)
 
 internal val AUTHENTICATION_CONTROLLER_UNDER_TEST = AuthenticationControllerImpl(AUTHENTICATION_SERVICE_UNDER_TEST)
\ No newline at end of file
diff --git a/bitframe-server/frameworks/ktor/src/main/kotlin/bitframe/Application.kt b/bitframe-server/frameworks/ktor/src/main/kotlin/bitframe/Application.kt
index 27b13320..1f9256cb 100644
--- a/bitframe-server/frameworks/ktor/src/main/kotlin/bitframe/Application.kt
+++ b/bitframe-server/frameworks/ktor/src/main/kotlin/bitframe/Application.kt
@@ -5,6 +5,7 @@ import bitframe.server.http.HttpRequest
 import bitframe.server.modules.Module
 import bitframe.server.modules.authentication.AuthenticationModule
 import io.ktor.application.*
+import io.ktor.features.*
 import io.ktor.http.*
 import io.ktor.http.content.*
 import io.ktor.request.*
@@ -23,6 +24,19 @@ class Application(
     @JvmOverloads
     fun start(port: Int = 8080) = embeddedServer(CIO, port) {
         println("Serving files from ${client.absolutePath}")
+        install(CORS) {
+            method(HttpMethod.Options)
+            method(HttpMethod.Get)
+            method(HttpMethod.Post)
+            method(HttpMethod.Put)
+            method(HttpMethod.Delete)
+            method(HttpMethod.Patch)
+            header(HttpHeaders.AccessControlAllowHeaders)
+            header(HttpHeaders.ContentType)
+            header(HttpHeaders.AccessControlAllowOrigin)
+            anyHost()
+            allowCredentials = true
+        }
         routing {
             static("/") {
                 staticRootFolder = client.absoluteFile
diff --git a/buildSrc/src/main/kotlin/versions.kt b/buildSrc/src/main/kotlin/versions.kt
index a90a60f4..e958069c 100644
--- a/buildSrc/src/main/kotlin/versions.kt
+++ b/buildSrc/src/main/kotlin/versions.kt
@@ -24,8 +24,8 @@ object vers {
     }
 
     object bitframe {
-        val current = "0.0.29"
-        val previous = "0.0.28"
+        val current = "0.0.30"
+        val previous = "0.0.29"
     }
 
     object asoft {
diff --git a/pi-monitor/pi-monitor-client/browser/react/build.gradle.kts b/pi-monitor/pi-monitor-client/browser/react/build.gradle.kts
index 1f77dcd4..f69b9b71 100644
--- a/pi-monitor/pi-monitor-client/browser/react/build.gradle.kts
+++ b/pi-monitor/pi-monitor-client/browser/react/build.gradle.kts
@@ -99,8 +99,6 @@ val jvmTest by tasks.getting(Test::class) {
     )
     if (System.getenv("TEST_MODE") == "CI") {
         dependsOn(":pi-monitor-server:createDockerfile")
-//        val bin = System.getenv("CHROME_BIN") ?: "/usr/local/share/chrome_driver"
-//        props["selenide.browserBinary"] = "/usr/bin/google-chrome"
     }
     systemProperties(props)
     testLogging {
diff --git a/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/authentication/signup/SignUp.kt b/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/authentication/signup/SignUp.kt
index 0bea16c7..3401a76f 100644
--- a/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/authentication/signup/SignUp.kt
+++ b/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/authentication/signup/SignUp.kt
@@ -1,5 +1,6 @@
 package pimonitor.authentication.signup
 
+import bitframe.PanelPageRoute
 import bitframe.components.TextInput
 import bitframe.presenters.feedbacks.FormFeedback
 import kotlinx.css.*
@@ -7,6 +8,7 @@ import kotlinx.extensions.onDesktop
 import kotlinx.extensions.onMobile
 import kotlinx.extensions.text
 import kotlinx.html.InputType
+import logging.logger
 import pimonitor.PiMonitorService
 import pimonitor.authentication.signup.exports.SignUpScope
 import pimonitor.monitors.SignUpParams
@@ -16,6 +18,7 @@ import react.dom.p
 import react.fc
 import react.router.dom.useHistory
 import react.router.dom.withRouter
+import react.useEffectOnce
 import reakt.*
 import styled.css
 import styled.styledH2
@@ -29,9 +32,13 @@ private external class SignUpProps : Props {
 
 private val SignUp = fc<SignUpProps> { props ->
     val scope = props.scope
+    val useSignInEvent = scope.useSignInEvent
     val viewModel = scope.viewModel
     val state = useViewModelState(viewModel)
     val history = useHistory()
+    useSignInEvent {
+        history.push(PanelPageRoute)
+    }
     FlexBox {
         css {
             minHeight = 100.vh
@@ -109,5 +116,5 @@ private val SignUp = fc<SignUpProps> { props ->
 }
 
 fun RBuilder.SignUp(service: PiMonitorService) = child(withRouter(SignUp)) {
-    attrs.scope = SignUpScope(service.signUp)
+    attrs.scope = SignUpScope(service)
 }
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/authentication/signup/legacy/IndividualForm.kt b/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/authentication/signup/legacy/IndividualForm.kt
deleted file mode 100644
index f861b66d..00000000
--- a/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/authentication/signup/legacy/IndividualForm.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package pimonitor.authentication.signup.legacy
-
-import bitframe.components.*
-import kotlinx.css.em
-import kotlinx.css.padding
-import kotlinx.css.pct
-import kotlinx.extensions.onDesktop
-import kotlinx.extensions.onMobile
-import kotlinx.extensions.text
-import kotlinx.html.InputType
-import pimonitor.authentication.signup.IndividualRegistrationParams
-import pimonitor.authentication.signup.legacy.IndividualFormFields
-import react.RBuilder
-import reakt.*
-import styled.css
-import styled.styledH2
-import theme.clazz
-
-internal fun RBuilder.IndividualForm(
-    fields: IndividualFormFields,
-    onNext: (IndividualRegistrationParams) -> Unit,
-) = FlexBox {
-    css {
-        centerContent()
-        onMobile { padding(horizontal = 1.em) }
-        onDesktop { padding(horizontal = 20.pct) }
-    }
-
-    Form { theme ->
-        styledH2 {
-            css { +theme.text.h4.clazz }
-            +fields.title
-        }
-
-        TextInput("name", fields.name)
-
-        TextInput("email", fields.email, InputType.email)
-
-        TextInput("password", fields.password, InputType.password)
-
-        Grid(cols = "1fr 1fr") {
-            OutlinedButton("Cancel", onClick = fields.prevButton.handler)
-            ContainedButton("Next")
-        }
-    } onSubmit {
-        val name by text()
-        val email by text()
-        val password by text()
-        onNext(IndividualRegistrationParams(name, email, password))
-    }
-}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/authentication/signup/legacy/OrganisationForm.kt b/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/authentication/signup/legacy/OrganisationForm.kt
deleted file mode 100644
index 03a6195a..00000000
--- a/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/authentication/signup/legacy/OrganisationForm.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package pimonitor.authentication.signup.legacy
-
-import bitframe.components.TextInput
-import kotlinx.css.em
-import kotlinx.css.padding
-import kotlinx.css.pct
-import kotlinx.extensions.onDesktop
-import kotlinx.extensions.onMobile
-import kotlinx.extensions.text
-import kotlinx.html.InputType
-import pimonitor.authentication.signup.MonitorBusinessParams
-import pimonitor.authentication.signup.legacy.OrganisationFormFields
-import react.RBuilder
-import reakt.*
-import styled.css
-import styled.styledH2
-import theme.clazz
-
-internal fun RBuilder.OrganisationForm(
-    fields: OrganisationFormFields,
-    onNext: (MonitorBusinessParams) -> Unit,
-) = FlexBox {
-    css {
-        centerContent()
-        onMobile { padding(horizontal = 1.em) }
-        onDesktop { padding(horizontal = 20.pct) }
-    }
-
-    Form { theme ->
-        styledH2 {
-            css { +theme.text.h4.clazz }
-            +fields.title
-        }
-
-        TextInput("name", fields.name)
-
-        TextInput("email", fields.email, InputType.email)
-
-        Grid(cols = "1fr 1fr") {
-            OutlinedButton("Cancel", onClick = fields.prevButton.handler)
-            ContainedButton("Next")
-        }
-    } onSubmit {
-        val name by text()
-        val email by text()
-        onNext(MonitorBusinessParams(name, email))
-    }
-}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/authentication/signup/legacy/SelectRegistrationType.kt b/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/authentication/signup/legacy/SelectRegistrationType.kt
deleted file mode 100644
index 8cf572e7..00000000
--- a/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/authentication/signup/legacy/SelectRegistrationType.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package pimonitor.authentication.signup.legacy
-
-import color.invoke
-import kotlinx.css.*
-import kotlinx.html.js.onClickFunction
-import react.RBuilder
-import reakt.AspectRationDiv
-import reakt.Grid
-import reakt.centerContent
-import styled.css
-import styled.styledDiv
-import styled.styledH2
-import theme.clazz
-
-internal fun RBuilder.SelectRegistrationType(
-    onIndividualClicked: () -> Unit,
-    onOrganisationClicked: () -> Unit
-) = styledDiv {
-    css {
-        centerContent()
-        margin(LinearDimension.auto)
-        minWidth = 250.px
-    }
-
-    Grid { theme ->
-        css { gridColumn = GridColumn("1/3") }
-        styledH2 {
-            css { +theme.text.h2.clazz }
-            +"Register As"
-        }
-    }
-
-    Grid(cols = "1fr 1fr") { theme ->
-        listOf(
-            "Individual" to onIndividualClicked,
-            "Organisation" to onOrganisationClicked
-        ).forEach { (group, handler) ->
-            AspectRationDiv {
-                css {
-                    backgroundColor = theme.color.primary()
-                    color = theme.color.onPrimary()
-                    hover {
-                        backgroundColor = theme.color.primaryVariant()
-                        color = theme.color.onPrimary()
-                    }
-                    cursor = Cursor.pointer
-                }
-                attrs.onClickFunction = { handler() }
-                styledDiv { +group }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/authentication/signup/legacy/SignUp.kt b/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/authentication/signup/legacy/SignUp.kt
deleted file mode 100644
index 58138a90..00000000
--- a/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/authentication/signup/legacy/SignUp.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package pimonitor.authentication.signup.legacy
-
-import kotlinx.css.minHeight
-import kotlinx.css.vh
-import pimonitor.PiMonitorService
-import pimonitor.authentication.signup.legacy.SignUpState.*
-import pimonitor.authentication.signup.exports.SignUpScopeLegacy
-import pimonitor.authentication.signup.legacy.SignUpIntent as Intent
-import react.Props
-import react.RBuilder
-import react.fc
-import react.router.dom.useHistory
-import react.router.dom.withRouter
-import reakt.ErrorBox
-import reakt.Grid
-import reakt.LoadingBox
-import reakt.SuccessBox
-import styled.css
-import useViewModelState
-
-private external class SignUpProps : Props {
-    var scope: SignUpScopeLegacy
-}
-
-private val SignUp = fc<SignUpProps> { props ->
-    val scope = props.scope
-    val viewModel = scope.viewModel
-    val state = useViewModelState(viewModel)
-    val history = useHistory()
-    Grid {
-        css { minHeight = 100.vh }
-
-        when (state) {
-            is Loading -> LoadingBox(state.message)
-            is Failure -> ErrorBox(state.cause)
-            is Success -> SuccessBox(state.message)
-            is OrganisationForm -> OrganisationForm(
-                fields = state.fields,
-                onNext = { viewModel.post(Intent.SubmitBusinessForm(it)) }
-            )
-            is IndividualForm -> IndividualForm(
-                fields = state.fields,
-                onNext = { viewModel.post(Intent.SubmitIndividualForm(it)) }
-            )
-            SelectRegistrationType -> SelectRegistrationType(
-                onIndividualClicked = { scope.registerAsIndividual() },
-                onOrganisationClicked = { scope.registerAsOrganisation() }
-            )
-        }
-    }
-}
-
-fun RBuilder.SignUpLegacy(service: PiMonitorService) = child(withRouter(SignUp)) {
-    attrs.scope = SignUpScopeLegacy(service.signUp)
-}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/evaluation/business/BusinessContainer.kt b/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/evaluation/business/BusinessContainer.kt
index acc2a026..49c9e493 100644
--- a/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/evaluation/business/BusinessContainer.kt
+++ b/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/evaluation/business/BusinessContainer.kt
@@ -28,11 +28,14 @@ private val BusinessContainer = fc<BusinessContainerProps> { props ->
         is BusinessesState.Businesses -> styledDiv {
             FlexBox {
                 css { justifyContent = JustifyContent.flexEnd }
-                ContainedButton("Create") {}
+                ContainedButton("Create") { viewModel.post(BusinessesIntent.ShowBusinessForm) }
             }
             if (state.data.isEmpty()) EmptyBusiness()
             else BusinessList(state.data)
         }
+        is BusinessesState.BusinessForm -> styledDiv {
+            +"Creating form, just wait and see"
+        }
         is BusinessesState.Success -> SuccessBox(state.message)
     }
 }
diff --git a/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/evaluation/business/BusinessList.kt b/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/evaluation/business/BusinessList.kt
index 3febda53..4ff51e0c 100644
--- a/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/evaluation/business/BusinessList.kt
+++ b/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/evaluation/business/BusinessList.kt
@@ -1,17 +1,17 @@
 package pimonitor.evaluation.business
 
-import pimonitor.Monitor
+import pimonitor.monitored.MonitoredBusiness
 import react.RBuilder
 import reakt.*
 
 internal fun RBuilder.BusinessList(
-    data: List<Monitor.Business>
+    data: List<MonitoredBusiness>
 ) = ReactTable(
     data,
     columns = listOf(
         Column("name") { it.name },
-        Column("email") { it.email.value },
-        Column("contact") { it.name },
+        Column("email") { it.contacts.first().email.value },
+        Column("contact") { it.contacts.first().name },
         RenderColumn("actions") {
             Grid(cols = "1fr 1fr") {
                 ContainedButton("View") {}
diff --git a/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/index.kt b/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/index.kt
index d17eef9f..2ce67aa0 100644
--- a/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/index.kt
+++ b/pi-monitor/pi-monitor-client/browser/react/src/jsMain/kotlin/pimonitor/index.kt
@@ -7,21 +7,18 @@ import kotlinext.js.jso
 import kotlinx.browser.document
 import kotlinx.extensions.By
 import kotlinx.extensions.get
-import logging.ConsoleAppender
-import logging.Logging
 import org.w3c.dom.HTMLDivElement
 import pimonitor.authentication.signup.SignUp
-import pimonitor.authentication.signup.legacy.SignUpLegacy
 import pimonitor.evaluation.business.BusinessContainer
 import reakt.setContent
 
 fun main() = document.get<HTMLDivElement>(By.id("root")).setContent {
     val client = client(jso {
         appId = "test-client"
-        simulationTime = 3000
+//        url = "http://localhost:8080"
+        simulationTime = 1500
     })
     val version: String by konfig()
-    Logging.init(ConsoleAppender())
     Bitframe(
         client = client,
         routeRenderers = mapOf(
diff --git a/pi-monitor/pi-monitor-client/browser/react/src/jvmTest/kotlin/acceptance/authentication/SignUp.kt b/pi-monitor/pi-monitor-client/browser/react/src/jvmTest/kotlin/acceptance/authentication/SignUp.kt
index 5b44a7bd..1d45bd04 100644
--- a/pi-monitor/pi-monitor-client/browser/react/src/jvmTest/kotlin/acceptance/authentication/SignUp.kt
+++ b/pi-monitor/pi-monitor-client/browser/react/src/jvmTest/kotlin/acceptance/authentication/SignUp.kt
@@ -3,15 +3,11 @@
 package acceptance.authentication
 
 import acceptance.utils.AcceptanceTest
-import expect.expect
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.TestInstance
 import org.testcontainers.junit.jupiter.Testcontainers
-import pimonitor.authentication.signup.IndividualRegistrationParams
-import pimonitor.authentication.signup.MonitorBusinessParams
-import pimonitor.screens.api.toBeVisible
+import pimonitor.monitors.SignUpParams
 import pimonitor.test
-import kotlin.test.Ignore
 import kotlin.test.Test
 
 @Testcontainers
@@ -21,34 +17,31 @@ class SignUp : AcceptanceTest() {
     @Nested
     inner class `Individual Registration` {
         // Given a Person with details
-        private val person = IndividualRegistrationParams(
+        private val person = SignUpParams.Individual(
             name = "John Doe", email = "john.doe@johndoeinc.com", password = "1234"
         )
 
         @Test
         fun should_should_be_able_to_sign_individually() = application.test {
             val signUpScreen = openSignUpScreen()
-            signUpScreen.signUpIndividuallyAs(person)
+            signUpScreen.signUp(person)
             signUpScreen.expectUserToBeRegistered()
         }
     }
 
     @Nested
     inner class `Organisational Registration` {
-        // Given
-        private val person = IndividualRegistrationParams(
-            name = "John Doe", email = "john.doe@johndoeinc.com", password = "1234"
-        )
-
-        // Given
-        private val business = MonitorBusinessParams(
-            name = "John Doe Inc.", email = "support@johndoeinc.com"
+        private val params = SignUpParams.Business(
+            businessName = "John Doe Inc.",
+            individualName = "John Doe",
+            individualEmail = "john.doe@johndoeinc.com",
+            password = "1234"
         )
 
         @Test
         fun should_register_a_new_user() = application.test {
             val signUpScreen = openSignUpScreen()
-            signUpScreen.signUpAs(person, representing = business)
+            signUpScreen.signUp(with = params)
             signUpScreen.expectUserToBeRegistered()
         }
     }
diff --git a/pi-monitor/pi-monitor-client/sdks/core/src/jsMain/kotlin/index.kt b/pi-monitor/pi-monitor-client/sdks/core/src/jsMain/kotlin/index.kt
index ea71490f..ebebf670 100644
--- a/pi-monitor/pi-monitor-client/sdks/core/src/jsMain/kotlin/index.kt
+++ b/pi-monitor/pi-monitor-client/sdks/core/src/jsMain/kotlin/index.kt
@@ -2,9 +2,11 @@
 @file:JsExport
 
 import bitframe.authentication.signin.exports.SignInServiceWrapper
+import bitframe.service.config.KtorClientConfiguration
 import logging.ConsoleAppender
 import logging.Logging
 import pimonitor.PiMonitorService
+import pimonitor.PiMonitorServiceKtor
 import pimonitor.PiMonitorServiceStub
 import pimonitor.StubServiceConfig
 import pimonitor.authentication.signup.exports.SignUpServiceWrapper
@@ -12,6 +14,7 @@ import pimonitor.evaluation.business.exports.BusinessesServiceWrapper
 
 external interface ServiceConfiguration {
     var appId: String
+    var url: String?
     var simulationTime: Int?
     var disableViewModelLogs: Boolean?
 }
@@ -23,11 +26,13 @@ fun client(config: ServiceConfiguration): PiMonitorService {
         Logging.init(ConsoleAppender())
         isLoggingEnabled = true
     }
-    return PiMonitorServiceStub(
-        StubServiceConfig(
-            appId = config.appId,
-            simulationTime = config.simulationTime?.toLong() ?: 2000L
-        )
+    val url = config.url
+    val appId = config.appId
+    val simulationTime = config.simulationTime?.toLong() ?: 2000L
+    return if (url == null) PiMonitorServiceStub(
+        StubServiceConfig(appId, simulationTime)
+    ) else PiMonitorServiceKtor(
+        KtorClientConfiguration(url, appId)
     )
 }
 
diff --git a/pi-monitor/pi-monitor-client/sdks/core/src/jsMain/kotlin/pimonitor/authentication/signup/exports/ParamsUtils.kt b/pi-monitor/pi-monitor-client/sdks/core/src/jsMain/kotlin/pimonitor/authentication/signup/exports/ParamsUtils.kt
index c9baeb2a..4f22e2dc 100644
--- a/pi-monitor/pi-monitor-client/sdks/core/src/jsMain/kotlin/pimonitor/authentication/signup/exports/ParamsUtils.kt
+++ b/pi-monitor/pi-monitor-client/sdks/core/src/jsMain/kotlin/pimonitor/authentication/signup/exports/ParamsUtils.kt
@@ -1,12 +1,7 @@
 package pimonitor.authentication.signup.exports
 
-import pimonitor.authentication.signup.IndividualRegistrationParams
-import pimonitor.authentication.signup.MonitorBusinessParams
 import pimonitor.monitors.SignUpParams
 
-fun RegisterIndividualParams.toIndividualRegistrationParams() = IndividualRegistrationParams(name, email, password)
-fun RegisterOrganisationParams.toMonitorBusinessParams() = MonitorBusinessParams(name, email)
-
 fun RegisterIndividualParams.toSignUpParams() = SignUpParams.Individual(name, email, password)
 
 fun RegisterBusinessParams.toSignUpParams() = SignUpParams.Business(businessName, individualName, individualEmail, password)
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-client/sdks/core/src/jsMain/kotlin/pimonitor/authentication/signup/exports/SignUpServiceWrapper.kt b/pi-monitor/pi-monitor-client/sdks/core/src/jsMain/kotlin/pimonitor/authentication/signup/exports/SignUpServiceWrapper.kt
index 089263c6..a638bde7 100644
--- a/pi-monitor/pi-monitor-client/sdks/core/src/jsMain/kotlin/pimonitor/authentication/signup/exports/SignUpServiceWrapper.kt
+++ b/pi-monitor/pi-monitor-client/sdks/core/src/jsMain/kotlin/pimonitor/authentication/signup/exports/SignUpServiceWrapper.kt
@@ -6,6 +6,7 @@ package pimonitor.authentication.signup.exports
 import pimonitor.authentication.signup.SignUpService
 
 open class SignUpServiceWrapper(service: SignUpService) {
+
     val registerIndividual = { params: RegisterIndividualParams ->
         service.signUp(params.toSignUpParams())
     }
diff --git a/pi-monitor/pi-monitor-client/sdks/core/src/jsMain/kotlin/pimonitor/evaluation/business/exports/BusinessesServiceWrapper.kt b/pi-monitor/pi-monitor-client/sdks/core/src/jsMain/kotlin/pimonitor/evaluation/business/exports/BusinessesServiceWrapper.kt
index d5744daf..6b7f5602 100644
--- a/pi-monitor/pi-monitor-client/sdks/core/src/jsMain/kotlin/pimonitor/evaluation/business/exports/BusinessesServiceWrapper.kt
+++ b/pi-monitor/pi-monitor-client/sdks/core/src/jsMain/kotlin/pimonitor/evaluation/business/exports/BusinessesServiceWrapper.kt
@@ -3,8 +3,8 @@
 
 package pimonitor.evaluation.business.exports
 
-import pimonitor.evaluation.businesses.BusinessService
+import pimonitor.evaluation.businesses.BusinessesService
 
-class BusinessesServiceWrapper(service: BusinessService) {
+class BusinessesServiceWrapper(service: BusinessesService) {
     val loadBusinesses: () -> Unit = { service.all() }
 }
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpIntent.kt b/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpIntent.kt
index 6a15b921..54de2a82 100644
--- a/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpIntent.kt
+++ b/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpIntent.kt
@@ -2,14 +2,12 @@
 
 package pimonitor.authentication.signup
 
-import pimonitor.authentication.signup.legacy.IndividualFormFields
-import pimonitor.authentication.signup.legacy.OrganisationFormFields
 import pimonitor.monitors.SignUpParams
 import kotlin.js.JsExport
 
 sealed class SignUpIntent {
-    data class SelectRegisterAsIndividual(val fields: IndividualFormFields?) : SignUpIntent()
-    data class SelectRegisterAsBusiness(val fields: OrganisationFormFields?) : SignUpIntent()
+    object SelectRegisterAsIndividual : SignUpIntent()
+    object SelectRegisterAsBusiness : SignUpIntent()
 
     sealed class Submit(open val params: SignUpParams) : SignUpIntent() {
         data class IndividualForm(override val params: SignUpParams.Individual) : Submit(params)
diff --git a/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpViewModel.kt b/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpViewModel.kt
index 092e2707..42eba315 100644
--- a/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpViewModel.kt
+++ b/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpViewModel.kt
@@ -1,5 +1,6 @@
 package pimonitor.authentication.signup
 
+import bitframe.authentication.signin.SignInService
 import bitframe.presenters.feedbacks.FormFeedback.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
@@ -8,28 +9,31 @@ import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.launch
 import later.await
+import pimonitor.monitors.toCredentials
 import viewmodel.ViewModel
 import pimonitor.authentication.signup.SignUpIntent as Intent
 import pimonitor.authentication.signup.SignUpState as State
 
 class SignUpViewModel(
-    val service: SignUpService
+    val signUpService: SignUpService,
+    val signInService: SignInService
 ) : ViewModel<Intent, State>(State.IndividualForm(IndividualFormFields(), null)) {
     val recoveryTime = 3000L
 
     override fun CoroutineScope.execute(i: Intent): Any = when (i) {
-        is Intent.SelectRegisterAsIndividual -> selectRegisterAsIndividual(i)
-        is Intent.SelectRegisterAsBusiness -> selectRegisterAsBusiness(i)
-        is Intent.Submit.IndividualForm -> submitForm(i)
-        is Intent.Submit.BusinessForm -> submitForm(i)
+        Intent.SelectRegisterAsIndividual -> selectRegisterAsIndividual()
+        Intent.SelectRegisterAsBusiness -> selectRegisterAsBusiness()
+        is Intent.Submit -> submitForm(i)
     }
 
     private fun CoroutineScope.submitForm(i: Intent.Submit) = launch {
         val state = ui.value
         flow {
             emit(state.copy(i, Loading("Creating your account, please wait . . .")))
-            service.signUp(i.params).await()
-            emit(state.copy(i, Success("Your registration completed successfully")))
+            signUpService.signUp(i.params).await()
+            emit(state.copy(i, Loading("Success. Signing you in, please wait . . .")))
+            signInService.signIn(i.params.toCredentials()).await()
+            emit(state.copy(i, Success("Successfully signed in")))
         }.catch {
             emit(state.copy(i, Failure(it, "Failed to create your account")))
             delay(recoveryTime)
@@ -39,11 +43,11 @@ class SignUpViewModel(
         }
     }
 
-    private fun selectRegisterAsIndividual(i: Intent.SelectRegisterAsIndividual) {
+    private fun selectRegisterAsIndividual() {
         ui.value = State.IndividualForm(IndividualFormFields(), null)
     }
 
-    private fun selectRegisterAsBusiness(i: Intent.SelectRegisterAsBusiness) {
+    private fun selectRegisterAsBusiness() {
         ui.value = State.BusinessForm(BusinessFormFields(), null)
     }
 }
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/authentication/signup/legacy/IndividualFormFields.kt b/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/authentication/signup/legacy/IndividualFormFields.kt
deleted file mode 100644
index 9ce6701f..00000000
--- a/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/authentication/signup/legacy/IndividualFormFields.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-@file:JsExport
-
-package pimonitor.authentication.signup.legacy
-
-import bitframe.presenters.fields.ButtonInputField
-import bitframe.presenters.fields.TextInputField
-import pimonitor.authentication.signup.IndividualRegistrationParams
-import kotlin.js.JsExport
-
-data class IndividualFormFields(
-    val title: String = "Enter your personal information",
-    val name: TextInputField = TextInputField(
-        label = "Name",
-        hint = "John Doe"
-    ),
-    val email: TextInputField = TextInputField(
-        label = "Email",
-        hint = "john@doe.com"
-    ),
-    val password: TextInputField = TextInputField(
-        label = "Password",
-        hint = "secure-password"
-    ),
-    val nextButton: ButtonInputField = ButtonInputField("Submit"),
-    val prevButton: ButtonInputField = ButtonInputField("Back")
-) {
-    internal fun copy(params: IndividualRegistrationParams) = copy(
-        name = name.copy(value = params.name),
-        email = email.copy(value = params.email),
-        password = email.copy(value = params.password)
-    )
-}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/authentication/signup/legacy/OrganisationFormFields.kt b/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/authentication/signup/legacy/OrganisationFormFields.kt
deleted file mode 100644
index 717f0452..00000000
--- a/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/authentication/signup/legacy/OrganisationFormFields.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package pimonitor.authentication.signup.legacy
-
-import bitframe.presenters.fields.ButtonInputField
-import bitframe.presenters.fields.TextInputField
-import pimonitor.authentication.signup.MonitorBusinessParams
-import kotlin.js.JsExport
-
-@JsExport
-data class OrganisationFormFields(
-    val title: String = "Enter your organisation's information",
-    val name: TextInputField = TextInputField(
-        label = "Organisation's Name",
-        hint = "John Doe Enterprises"
-    ),
-    val email: TextInputField = TextInputField(
-        label = "Organisation's Email",
-        hint = "support@enterpries.com"
-    ),
-    val nextButton: ButtonInputField = ButtonInputField("Submit"),
-    val prevButton: ButtonInputField = ButtonInputField("Back")
-) {
-    internal fun copy(params: MonitorBusinessParams) = copy(
-        name = name.copy(value = params.name),
-        email = email.copy(value = params.email)
-    )
-
-    internal fun toParams() = MonitorBusinessParams(
-        name = name.value,
-        email = email.value
-    )
-}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/authentication/signup/legacy/SignUpIntent.kt b/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/authentication/signup/legacy/SignUpIntent.kt
deleted file mode 100644
index 6241f838..00000000
--- a/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/authentication/signup/legacy/SignUpIntent.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-@file:JsExport
-
-package pimonitor.authentication.signup.legacy
-
-import pimonitor.authentication.signup.IndividualRegistrationParams
-import pimonitor.authentication.signup.MonitorBusinessParams
-import kotlin.js.JsExport
-
-sealed class SignUpIntent {
-    object SelectRegistrationType : SignUpIntent()
-    data class RegisterAsIndividual(val fields: IndividualFormFields?) : SignUpIntent()
-    data class RegisterAsOrganization(val fields: OrganisationFormFields?) : SignUpIntent()
-    data class SubmitIndividualForm(val params: IndividualRegistrationParams) : SignUpIntent()
-    data class SubmitBusinessForm(val params: MonitorBusinessParams) : SignUpIntent()
-}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/authentication/signup/legacy/SignUpState.kt b/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/authentication/signup/legacy/SignUpState.kt
deleted file mode 100644
index b8a01516..00000000
--- a/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/authentication/signup/legacy/SignUpState.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-@file:JsExport
-
-package pimonitor.authentication.signup.legacy
-
-import kotlin.js.JsExport
-
-sealed class SignUpState {
-
-    data class Loading(val message: String) : SignUpState()
-
-    object SelectRegistrationType : SignUpState()
-
-    data class IndividualForm(
-        val fields: IndividualFormFields,
-        val organisationForm: OrganisationForm?
-    ) : SignUpState()
-
-    data class OrganisationForm(val fields: OrganisationFormFields) : SignUpState()
-
-    data class Success(val message: String) : SignUpState()
-
-    data class Failure(val cause: Throwable, val message: String? = cause.message) : SignUpState()
-}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/authentication/signup/legacy/SignUpViewModel.kt b/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/authentication/signup/legacy/SignUpViewModel.kt
deleted file mode 100644
index 480279eb..00000000
--- a/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/authentication/signup/legacy/SignUpViewModel.kt
+++ /dev/null
@@ -1,85 +0,0 @@
-package pimonitor.authentication.signup.legacy
-
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.launch
-import later.await
-import bitframe.presenters.fields.ButtonInputField
-import pimonitor.authentication.signup.*
-import pimonitor.authentication.signup.legacy.SignUpIntent.*
-import viewmodel.ViewModel
-import pimonitor.authentication.signup.legacy.SignUpIntent as Intent
-import pimonitor.authentication.signup.legacy.SignUpState as State
-
-class SignUpViewModel(
-    private val service: SignUpService
-) : ViewModel<Intent, State>(State.SelectRegistrationType) {
-
-    private val recoveryTime = 3000
-
-    override fun CoroutineScope.execute(i: Intent): Any = when (i) {
-        SelectRegistrationType -> ui.value = State.SelectRegistrationType
-        is RegisterAsIndividual -> ui.value = State.IndividualForm(
-            fields = i.fields ?: IndividualFormFields(
-                prevButton = ButtonInputField("Back") { post(SelectRegistrationType) }
-            ),
-            organisationForm = null
-        )
-        is RegisterAsOrganization -> ui.value = State.OrganisationForm(
-            fields = i.fields ?: OrganisationFormFields(
-                prevButton = ButtonInputField("Back") { post(SelectRegistrationType) }
-            )
-        )
-        is SubmitIndividualForm -> submitPersonalInfo(i, ui.value as State.IndividualForm)
-        is SubmitBusinessForm -> submitBusinessInfo(i, ui.value as State.OrganisationForm)
-    }
-
-    private fun CoroutineScope.submitPersonalInfo(
-        i: SubmitIndividualForm,
-        state: State.IndividualForm
-    ) = launch {
-        flow {
-            emit(State.Loading("Submitting your registration, Please wait . . ."))
-            val person = i.params.toPerson()
-            val organisationFields = state.organisationForm?.fields
-            if (organisationFields != null) {
-                val business = organisationFields.toParams().toBusiness()
-                service.register(business, representedBy = person).await()
-            } else {
-                service.registerIndividuallyAs(i.params).await()
-            }
-            emit(State.Success("Registration completed successfully"))
-        }.catch {
-            emit(State.Failure(it, "Registration failed"))
-            delay(recoveryTime.toLong())
-            emit(state.copy(fields = state.fields.copy(i.params)))
-        }.collect {
-            ui.value = it
-        }
-    }
-
-    private fun CoroutineScope.submitBusinessInfo(
-        i: SubmitBusinessForm,
-        state: State.OrganisationForm
-    ) = launch {
-        flow {
-            emit(State.Loading("Validating business input"))
-            i.params.toBusiness()
-            val params = IndividualFormFields(
-                prevButton = ButtonInputField("Back") {
-                    ui.value = state.copy(fields = state.fields.copy(i.params))
-                }
-            )
-            emit(State.IndividualForm(params, state.copy(fields = state.fields.copy(i.params))))
-        }.catch {
-            emit(State.Failure(it, "Validation Failed"))
-            delay(recoveryTime.toLong())
-            emit(state.copy(fields = state.fields.copy(i.params)))
-        }.collect {
-            ui.value = it
-        }
-    }
-}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/evaluation/business/BusinessViewModel.kt b/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/evaluation/business/BusinessViewModel.kt
index a06802af..61902d2c 100644
--- a/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/evaluation/business/BusinessViewModel.kt
+++ b/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/evaluation/business/BusinessViewModel.kt
@@ -11,15 +11,16 @@ import later.await
 import viewmodel.ViewModel
 import kotlin.js.JsExport
 import pimonitor.evaluation.business.BusinessesIntent.*
-import pimonitor.evaluation.businesses.BusinessService
+import pimonitor.evaluation.businesses.BusinessesService
 import pimonitor.evaluation.business.BusinessesIntent as Intent
 import pimonitor.evaluation.business.BusinessesState as State
 
 class BusinessViewModel(
-    val service: BusinessService
+    val service: BusinessesService
 ) : ViewModel<Intent, State>(State.Loading("Loading business")) {
-    override fun CoroutineScope.execute(i: Intent) = when (i) {
+    override fun CoroutineScope.execute(i: Intent) :Any = when (i) {
         LoadBusinesses -> loadBusiness()
+        ShowBusinessForm -> ui.value = State.BusinessForm()
     }
 
     private fun CoroutineScope.loadBusiness() = launch {
diff --git a/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/evaluation/business/BusinessesIntent.kt b/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/evaluation/business/BusinessesIntent.kt
index 61316649..fcaacb26 100644
--- a/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/evaluation/business/BusinessesIntent.kt
+++ b/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/evaluation/business/BusinessesIntent.kt
@@ -6,4 +6,5 @@ import kotlin.js.JsExport
 
 sealed class BusinessesIntent {
     object LoadBusinesses : BusinessesIntent()
+    object ShowBusinessForm : BusinessesIntent()
 }
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/evaluation/business/BusinessesState.kt b/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/evaluation/business/BusinessesState.kt
index b9c503f3..4c8afc4e 100644
--- a/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/evaluation/business/BusinessesState.kt
+++ b/pi-monitor/pi-monitor-client/sdks/full/src/commonMain/kotlin/pimonitor/evaluation/business/BusinessesState.kt
@@ -2,12 +2,13 @@
 
 package pimonitor.evaluation.business
 
-import pimonitor.Monitor
+import pimonitor.monitored.MonitoredBusiness
 import kotlin.js.JsExport
 
 sealed class BusinessesState {
     data class Loading(val message: String) : BusinessesState()
-    data class Businesses(val data: List<Monitor.Business>) : BusinessesState()
+    data class Businesses(val data: List<MonitoredBusiness>) : BusinessesState()
+    data class BusinessForm(val form: Boolean = true) : BusinessesState()
     data class Failure(val cause: Throwable, val message: String? = cause.message) : BusinessesState()
     data class Success(val message: String) : BusinessesState()
 }
diff --git a/pi-monitor/pi-monitor-client/sdks/full/src/commonTest/kotlin/core/signup/SignUpViewModelTest.kt b/pi-monitor/pi-monitor-client/sdks/full/src/commonTest/kotlin/core/signup/SignUpViewModelTest.kt
index 8256a84a..bf46e0fb 100644
--- a/pi-monitor/pi-monitor-client/sdks/full/src/commonTest/kotlin/core/signup/SignUpViewModelTest.kt
+++ b/pi-monitor/pi-monitor-client/sdks/full/src/commonTest/kotlin/core/signup/SignUpViewModelTest.kt
@@ -6,16 +6,23 @@ import pimonitor.PiMonitorService
 import pimonitor.authentication.signup.*
 import pimonitor.monitors.SignUpParams
 import testing.IntegrationTest
+import testing.annotations.Lifecycle
+import testing.annotations.TestInstance
+import testing.annotations.Testcontainers
 import viewmodel.expect
+import kotlin.test.Ignore
 import kotlin.test.Test
 import pimonitor.authentication.signup.SignUpIntent as Intent
 import pimonitor.authentication.signup.SignUpState as State
 
+@Testcontainers
+@TestInstance(Lifecycle.PER_CLASS)
 abstract class SignUpViewModelTest : IntegrationTest() {
 
     abstract val service: PiMonitorService
 
-    val vm by lazy { SignUpViewModel(service.signUp) }
+    val viewModel get() = SignUpViewModel(service.signUp, service.signIn)
+    val vm by lazy { viewModel }
 
     private val testIndividualParams = SignUpParams.Individual(
         name = "John Doe", email = "john@email.com", password = "john@email.com"
@@ -25,33 +32,29 @@ abstract class SignUpViewModelTest : IntegrationTest() {
         businessName = "John Doe Inc", individualName = "John Doe", individualEmail = "john@doe.com", "1234"
     )
 
-    @Test
-    fun should_start_in_a_register_as_an_individual_state() {
-        val initialState = State.IndividualForm(IndividualFormFields(), null)
-        expect(vm).toBeIn(initialState)
-    }
-
     @Test
     fun should_change_to_business_form_when_intent_is_initiated() = runTest {
-        vm.expect(Intent.SelectRegisterAsBusiness(null)).toGoThrough(
+        vm.expect(Intent.SelectRegisterAsBusiness).toGoThrough(
             State.BusinessForm(BusinessFormFields(), null)
         )
     }
 
     @Test
+    @Ignore // TODO fix in memory dao query, write its tests for god's sake
     fun should_be_able_to_submit_an_individual_form() = runTest {
-        vm.expect(Intent.SelectRegisterAsIndividual(null))
+        vm.expect(Intent.SelectRegisterAsIndividual)
         val state = State.IndividualForm(IndividualFormFields(), null)
         val intent = Intent.Submit.IndividualForm(testIndividualParams)
         vm.expect(intent).toGoThrough(
             state.copy(intent, Loading("Creating your account, please wait . . .")),
-            state.copy(intent, Success("Your registration completed successfully"))
+            state.copy(intent, Loading("Success. Signing you in, please wait . . .")),
+            state.copy(intent, Success("Successfully signed in"))
         )
     }
 
     @Test
     fun should_fail_to_submit_with_invalid_email() = runTest {
-        vm.expect(Intent.SelectRegisterAsIndividual(null))
+        vm.expect(Intent.SelectRegisterAsIndividual)
         val params = testIndividualParams.copy(email = "johnemail.com")
         val intent = Intent.Submit.IndividualForm(params)
         val status = vm.expect(intent).value.firstNotNullOfOrNull {
@@ -64,7 +67,7 @@ abstract class SignUpViewModelTest : IntegrationTest() {
 
     @Test
     fun should_fail_to_submit_with_empty_name() = runTest {
-        vm.expect(Intent.SelectRegisterAsIndividual(null))
+        vm.expect(Intent.SelectRegisterAsIndividual)
         val params = testIndividualParams.copy(name = "")
         val intent = Intent.Submit.IndividualForm(params)
         val status = vm.expect(intent).value.firstNotNullOfOrNull {
@@ -77,12 +80,13 @@ abstract class SignUpViewModelTest : IntegrationTest() {
 
     @Test
     fun should_be_able_to_submit_a_business_form() = runTest {
-        vm.expect(Intent.SelectRegisterAsBusiness(null))
+        vm.expect(Intent.SelectRegisterAsBusiness)
         val state = State.BusinessForm(BusinessFormFields(), null)
         val intent = Intent.Submit.BusinessForm(testBusinessParams)
         vm.expect(intent).toGoThrough(
             state.copy(intent, Loading("Creating your account, please wait . . .")),
-            state.copy(intent, Success("Your registration completed successfully"))
+            state.copy(intent, Loading("Success. Signing you in, please wait . . .")),
+            state.copy(intent, Success("Successfully signed in"))
         )
     }
 }
diff --git a/pi-monitor/pi-monitor-client/sdks/full/src/commonTest/kotlin/integration/signup/SignUpViewModelIntegrationTest.kt b/pi-monitor/pi-monitor-client/sdks/full/src/commonTest/kotlin/integration/signup/SignUpViewModelIntegrationTest.kt
index b1882956..eca97993 100644
--- a/pi-monitor/pi-monitor-client/sdks/full/src/commonTest/kotlin/integration/signup/SignUpViewModelIntegrationTest.kt
+++ b/pi-monitor/pi-monitor-client/sdks/full/src/commonTest/kotlin/integration/signup/SignUpViewModelIntegrationTest.kt
@@ -9,7 +9,6 @@ import pimonitor.StubServiceConfig
 import kotlin.test.Ignore
 import kotlin.test.Test
 
-@Ignore // TODO
 class SignUpViewModelIntegrationTest : SignUpViewModelTest() {
 
     override val service: PiMonitorService by lazy {
diff --git a/pi-monitor/pi-monitor-client/sdks/full/src/commonTest/kotlin/integration/signup/legacy/Sign_Up_As_An_Individual_ViewModel_Test.kt b/pi-monitor/pi-monitor-client/sdks/full/src/commonTest/kotlin/integration/signup/legacy/Sign_Up_As_An_Individual_ViewModel_Test.kt
deleted file mode 100644
index b458647b..00000000
--- a/pi-monitor/pi-monitor-client/sdks/full/src/commonTest/kotlin/integration/signup/legacy/Sign_Up_As_An_Individual_ViewModel_Test.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-@file:Suppress("ClassName")
-
-package integration.signup.legacy
-
-import expect.expect
-import expect.toBe
-import kotlinx.coroutines.runTest
-import pimonitor.authentication.signup.IndividualRegistrationParams
-import pimonitor.authentication.signup.legacy.IndividualFormFields
-import pimonitor.authentication.signup.legacy.SignUpViewModel
-import utils.SERVICE_UNDER_TEST
-import viewmodel.expect
-import kotlin.test.Test
-import pimonitor.authentication.signup.legacy.SignUpIntent as Intent
-import pimonitor.authentication.signup.legacy.SignUpState as State
-
-class Sign_Up_As_An_Individual_ViewModel_Test {
-    @Test
-    fun the_register_should_start_at_the_selection_screen() {
-        val vm = SignUpViewModel(SERVICE_UNDER_TEST.signUp)
-        expect(vm.ui.value).toBe<State.SelectRegistrationType>()
-    }
-
-    @Test
-    fun the_register_should_be_able_to_move_from_selection_screen_to_personal_info_form_screen() = runTest {
-        val vm = SignUpViewModel(SERVICE_UNDER_TEST.signUp)
-        val expectedState = State.IndividualForm(IndividualFormFields(), null)
-        vm.expect(Intent.RegisterAsIndividual(null)).toBeIn(expectedState)
-
-        vm.expect(Intent.SubmitIndividualForm(IndividualRegistrationParams("John Doe", "john@doe.com", "1234"))).toGoThrough(
-            State.Loading("Submitting your registration, Please wait . . ."),
-            State.Success("Registration completed successfully")
-        )
-    }
-}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-client/sdks/full/src/commonTest/kotlin/integration/signup/legacy/Sign_Up_As_An_Organisation_ViewModel_Test.kt b/pi-monitor/pi-monitor-client/sdks/full/src/commonTest/kotlin/integration/signup/legacy/Sign_Up_As_An_Organisation_ViewModel_Test.kt
deleted file mode 100644
index 470b9a9b..00000000
--- a/pi-monitor/pi-monitor-client/sdks/full/src/commonTest/kotlin/integration/signup/legacy/Sign_Up_As_An_Organisation_ViewModel_Test.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-@file:Suppress("ClassName")
-
-package integration.signup.legacy
-
-import expect.expect
-import expect.toBe
-import kotlinx.coroutines.runTest
-import pimonitor.authentication.signup.IndividualRegistrationParams
-import pimonitor.authentication.signup.MonitorBusinessParams
-import pimonitor.authentication.signup.legacy.OrganisationFormFields
-import pimonitor.authentication.signup.legacy.SignUpViewModel
-import utils.SERVICE_UNDER_TEST
-import viewmodel.expect
-import kotlin.test.Ignore
-import kotlin.test.Test
-import pimonitor.authentication.signup.legacy.SignUpIntent as Intent
-import pimonitor.authentication.signup.legacy.SignUpState as State
-
-class Sign_Up_As_An_Organisation_ViewModel_Test {
-    @Test
-    fun the_register_should_start_at_the_selection_screen() {
-        val vm = SignUpViewModel(SERVICE_UNDER_TEST.signUp)
-        expect(vm.ui.value).toBe<State.SelectRegistrationType>()
-    }
-
-    @Test
-    @Ignore
-    fun the_register_should_be_able_to_move_from_selection_screen_to_organisation_info_form_screen() = runTest {
-        val vm = SignUpViewModel(SERVICE_UNDER_TEST.signUp)
-
-        val expectedState = State.OrganisationForm(OrganisationFormFields())
-        vm.expect(Intent.RegisterAsOrganization(null)).toBeIn(expectedState)
-
-        // Enter business info
-        val businessInfo = MonitorBusinessParams(
-            name = "John Doe Enterprises",
-            email = "doe@enterprises.com"
-        )
-        vm.expect(Intent.SubmitBusinessForm(businessInfo)).toBeIn<State.IndividualForm>()
-
-        // Enter personal info
-        val personalInfo = IndividualRegistrationParams(
-            name = "John Doe",
-            email = "john@doe.com",
-            password = "1234"
-        )
-
-        vm.expect(Intent.SubmitIndividualForm(personalInfo)).toGoThrough(
-            State.Loading("Submitting your registration, Please wait . . ."),
-            State.Success("Registration completed successfully")
-        )
-    }
-}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-client/sdks/full/src/jsMain/kotlin/index.kt b/pi-monitor/pi-monitor-client/sdks/full/src/jsMain/kotlin/index.kt
index 24b7661a..caf458ed 100644
--- a/pi-monitor/pi-monitor-client/sdks/full/src/jsMain/kotlin/index.kt
+++ b/pi-monitor/pi-monitor-client/sdks/full/src/jsMain/kotlin/index.kt
@@ -2,15 +2,16 @@
 @file:Suppress("EXPERIMENTAL_API_USAGE", "NON_EXPORTABLE_TYPE")
 
 import bitframe.authentication.signin.exports.SignInScope
+import bitframe.events.EventBus
 import pimonitor.PiMonitorService
+import pimonitor.authentication.signup.SignUpResult
+import pimonitor.authentication.signup.SignUpService
 import pimonitor.authentication.signup.exports.SignUpScope
-import pimonitor.authentication.signup.exports.SignUpScopeLegacy
 import pimonitor.evaluation.business.BusinessesScope
+import react.useEffectOnce
 
 fun signIn(service: PiMonitorService) = SignInScope(service.signIn)
 
-fun signUpLegacy(service: PiMonitorService) = SignUpScopeLegacy(service.signUp)
-
-fun signUp(service: PiMonitorService) = SignUpScope(service.signUp)
+fun signUp(service: PiMonitorService) = SignUpScope(service)
 
 fun business(service: PiMonitorService) = BusinessesScope(service.businesses)
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-client/sdks/full/src/jsMain/kotlin/pimonitor/authentication/signup/exports/SignUpScope.kt b/pi-monitor/pi-monitor-client/sdks/full/src/jsMain/kotlin/pimonitor/authentication/signup/exports/SignUpScope.kt
index c6264f4d..fbe03270 100644
--- a/pi-monitor/pi-monitor-client/sdks/full/src/jsMain/kotlin/pimonitor/authentication/signup/exports/SignUpScope.kt
+++ b/pi-monitor/pi-monitor-client/sdks/full/src/jsMain/kotlin/pimonitor/authentication/signup/exports/SignUpScope.kt
@@ -3,22 +3,29 @@
 
 package pimonitor.authentication.signup.exports
 
+import bitframe.authentication.signin.Session
+import bitframe.authentication.signin.SignInService
+import pimonitor.PiMonitorService
+import pimonitor.authentication.signup.SignUpResult
 import pimonitor.authentication.signup.SignUpService
 import pimonitor.authentication.signup.SignUpViewModel
+import useEventHandler
 import viewmodel.ViewModel
 import pimonitor.authentication.signup.SignUpIntent as Intent
 import pimonitor.authentication.signup.SignUpState as State
 
-class SignUpScope(service: SignUpService) : SignUpServiceWrapper(service) {
+class SignUpScope(
+    private val service: PiMonitorService
+) : SignUpServiceWrapper(service.signUp) {
 
-    val viewModel: ViewModel<Intent, State> = SignUpViewModel(service)
+    val viewModel: ViewModel<Intent, State> = SignUpViewModel(service.signUp, service.signIn)
 
     val registerAsIndividual = {
-        viewModel.post(Intent.SelectRegisterAsIndividual(null))
+        viewModel.post(Intent.SelectRegisterAsIndividual)
     }
 
     val registerAsBusiness = {
-        viewModel.post(Intent.SelectRegisterAsBusiness(null))
+        viewModel.post(Intent.SelectRegisterAsBusiness)
     }
 
     val submitIndividualForm = { params: RegisterIndividualParams ->
@@ -28,4 +35,12 @@ class SignUpScope(service: SignUpService) : SignUpServiceWrapper(service) {
     val submitBusinessForm = { params: RegisterBusinessParams ->
         viewModel.post(Intent.Submit.BusinessForm(params.toSignUpParams()))
     }
+
+    val useSignUpEvent: (callback: (SignUpResult) -> Unit) -> Unit = {
+        useEventHandler(service.bus, SignUpService.SIGN_UP_EVENT_ID, it)
+    }
+
+    val useSignInEvent: (callback: (Session.SignedIn) -> Unit) -> Unit = {
+        useEventHandler(service.bus, SignInService.SIGN_IN_EVENT_ID, it)
+    }
 }
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-client/sdks/full/src/jsMain/kotlin/pimonitor/authentication/signup/exports/SignUpScopeLegacy.kt b/pi-monitor/pi-monitor-client/sdks/full/src/jsMain/kotlin/pimonitor/authentication/signup/exports/SignUpScopeLegacy.kt
deleted file mode 100644
index 936c4a61..00000000
--- a/pi-monitor/pi-monitor-client/sdks/full/src/jsMain/kotlin/pimonitor/authentication/signup/exports/SignUpScopeLegacy.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-@file:JsExport
-@file:Suppress("NON_EXPORTABLE_TYPE")
-
-package pimonitor.authentication.signup.exports
-
-import pimonitor.authentication.signup.SignUpService
-import pimonitor.authentication.signup.legacy.SignUpViewModel
-import viewmodel.ViewModel
-import pimonitor.authentication.signup.legacy.SignUpIntent as Intent
-import pimonitor.authentication.signup.legacy.SignUpState as State
-
-class SignUpScopeLegacy(service: SignUpService) : SignUpServiceWrapper(service) {
-
-    val viewModel: ViewModel<Intent, State> = SignUpViewModel(service)
-
-    val selectRegistrationType = {
-        viewModel.post(Intent.SelectRegistrationType)
-    }
-
-    val registerAsIndividual = {
-        viewModel.post(Intent.RegisterAsIndividual(null))
-    }
-
-    val registerAsOrganisation = {
-        viewModel.post(Intent.RegisterAsOrganization(null))
-    }
-
-    val submitIndividualForm = { params: RegisterIndividualParams ->
-        viewModel.post(Intent.SubmitIndividualForm(params.toIndividualRegistrationParams()))
-    }
-
-    val submitOrganisationForm = { params: RegisterOrganisationParams ->
-        viewModel.post(Intent.SubmitBusinessForm(params.toMonitorBusinessParams()))
-    }
-}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-client/sdks/full/src/jsMain/kotlin/pimonitor/evaluation/business/BusinessesScope.kt b/pi-monitor/pi-monitor-client/sdks/full/src/jsMain/kotlin/pimonitor/evaluation/business/BusinessesScope.kt
index 1fe04992..d965011b 100644
--- a/pi-monitor/pi-monitor-client/sdks/full/src/jsMain/kotlin/pimonitor/evaluation/business/BusinessesScope.kt
+++ b/pi-monitor/pi-monitor-client/sdks/full/src/jsMain/kotlin/pimonitor/evaluation/business/BusinessesScope.kt
@@ -3,12 +3,12 @@
 
 package pimonitor.evaluation.business
 
-import pimonitor.evaluation.businesses.BusinessService
+import pimonitor.evaluation.businesses.BusinessesService
 import viewmodel.ViewModel
 import pimonitor.evaluation.business.BusinessesIntent as Intent
 import pimonitor.evaluation.business.BusinessesState as State
 
-class BusinessesScope(service: BusinessService) {
+class BusinessesScope(service: BusinessesService) {
     val viewModel: ViewModel<Intent, State> = BusinessViewModel(service)
 
     val loadBusiness: () -> Unit = { viewModel.post(Intent.LoadBusinesses) }
diff --git a/pi-monitor/pi-monitor-client/test/src/commonMain/kotlin/pimonitor/screens/authentication/SignUpScreen.kt b/pi-monitor/pi-monitor-client/test/src/commonMain/kotlin/pimonitor/screens/authentication/SignUpScreen.kt
index 8815d80b..9eb0d916 100644
--- a/pi-monitor/pi-monitor-client/test/src/commonMain/kotlin/pimonitor/screens/authentication/SignUpScreen.kt
+++ b/pi-monitor/pi-monitor-client/test/src/commonMain/kotlin/pimonitor/screens/authentication/SignUpScreen.kt
@@ -1,11 +1,9 @@
 package pimonitor.screens.authentication
 
-import pimonitor.authentication.signup.IndividualRegistrationParams
-import pimonitor.authentication.signup.MonitorBusinessParams
+import pimonitor.monitors.SignUpParams
 import pimonitor.screens.api.Screen
 
 interface SignUpScreen : Screen {
-    suspend fun signUpIndividuallyAs(person: IndividualRegistrationParams)
-    suspend fun signUpAs(person: IndividualRegistrationParams, representing: MonitorBusinessParams)
+    suspend fun signUp(with: SignUpParams)
     suspend fun expectUserToBeRegistered()
 }
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-client/test/src/jvmMain/kotlin/pimonitor/screens/SignUpScreenWeb.kt b/pi-monitor/pi-monitor-client/test/src/jvmMain/kotlin/pimonitor/screens/SignUpScreenWeb.kt
index 9782562a..2e6614ad 100644
--- a/pi-monitor/pi-monitor-client/test/src/jvmMain/kotlin/pimonitor/screens/SignUpScreenWeb.kt
+++ b/pi-monitor/pi-monitor-client/test/src/jvmMain/kotlin/pimonitor/screens/SignUpScreenWeb.kt
@@ -4,27 +4,24 @@ import com.codeborne.selenide.Selectors.byAttribute
 import com.codeborne.selenide.Selectors.withText
 import com.codeborne.selenide.SelenideElement
 import org.openqa.selenium.By
-import pimonitor.authentication.signup.IndividualRegistrationParams
-import pimonitor.authentication.signup.MonitorBusinessParams
+import pimonitor.monitors.SignUpParams
 import pimonitor.screens.authentication.SignUpScreen
 import pimonitor.utils.isVisible
 import kotlin.properties.ReadOnlyProperty
-import kotlin.reflect.KProperty
-import kotlin.test.assertTrue
 import com.codeborne.selenide.Selenide.`$` as S
 
 class SignUpScreenWeb : SignUpScreen {
     val select = S(By.name("registrationType"))
-    private val passwordInput = S(By.name("password"))
     private val nextOrSubmitButton = S(byAttribute("type", "submit"))
 
-    override suspend fun signUpIndividuallyAs(person: IndividualRegistrationParams) {
-        val nameInput = S(By.name("name"))
-        val emailInput = S(By.name("email"))
+    private fun signUp(params: SignUpParams.Individual) {
+        val name by name()
+        val email by name()
+        val password by name()
 
-        nameInput.sendKeys(person.name)
-        emailInput.sendKeys(person.email)
-        passwordInput.sendKeys(person.password)
+        name.sendKeys(params.name)
+        email.sendKeys(params.email)
+        password.sendKeys(params.password)
 
         nextOrSubmitButton.click()
     }
@@ -33,7 +30,7 @@ class SignUpScreenWeb : SignUpScreen {
         S(By.name(property.name))
     }
 
-    override suspend fun signUpAs(person: IndividualRegistrationParams, representing: MonitorBusinessParams) {
+    private fun signUp(params: SignUpParams.Business) {
         select.selectOption(1)
 
         val businessName by name()
@@ -41,13 +38,18 @@ class SignUpScreenWeb : SignUpScreen {
         val individualEmail by name()
         val password by name()
 
-        businessName.sendKeys(representing.name)
-        individualName.sendKeys(person.name)
-        individualEmail.sendKeys(person.email)
-        password.sendKeys(person.password)
+        businessName.sendKeys(params.businessName)
+        individualName.sendKeys(params.individualName)
+        individualEmail.sendKeys(params.individualEmail)
+        password.sendKeys(params.password)
         nextOrSubmitButton.click()
     }
 
+    override suspend fun signUp(with: SignUpParams) = when (with) {
+        is SignUpParams.Business -> signUp(with)
+        is SignUpParams.Individual -> signUp(with)
+    }
+
     private suspend fun expectUserToBeRegistered(waitCounts: Int) {
         // TODO
 //
diff --git a/pi-monitor/pi-monitor-core/src/commonMain/kotlin/pimonitor/Monitor.kt b/pi-monitor/pi-monitor-core/src/commonMain/kotlin/pimonitor/Monitor.kt
deleted file mode 100644
index 251b63ad..00000000
--- a/pi-monitor/pi-monitor-core/src/commonMain/kotlin/pimonitor/Monitor.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package pimonitor
-
-import bitframe.annotations.Generated
-import bitframe.annotations.Module
-import contacts.Email
-import kotlinx.serialization.Serializable
-import kotlin.js.JsExport
-import kotlin.js.JsName
-import kotlin.jvm.JvmOverloads
-
-/**
- * A [Monitor] is an entity that monitors at least one [Monitored] entity
- */
-@JsExport
-@Serializable
-@Module
-data class Monitor(
-    @Generated val uid: String,
-    val business: Business,
-    val contacts: List<Person>
-) {
-    init {
-        require(contacts.isNotEmpty()) { "A Monitor must have at least one contact person" }
-    }
-
-    @Serializable
-    data class Business @JvmOverloads constructor(
-        val name: String,
-        val email: Email,
-        val logo: String? = null
-    ) {
-        @JvmOverloads
-        @JsName("from")
-        constructor(name: String, email: String, logo: String?) : this(name, Email(email), logo)
-    }
-
-    @Serializable
-    data class Person(
-        val name: String,
-        val email: Email,
-    )
-
-    val primaryContact get() = contacts.first()
-}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-core/src/commonMain/kotlin/pimonitor/Monitored.kt b/pi-monitor/pi-monitor-core/src/commonMain/kotlin/pimonitor/Monitored.kt
deleted file mode 100644
index a05a4908..00000000
--- a/pi-monitor/pi-monitor-core/src/commonMain/kotlin/pimonitor/Monitored.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package pimonitor
-
-import contacts.Email
-import kotlinx.serialization.Serializable
-import kotlin.js.JsExport
-
-/**
- * The one who is being watched over a.k.a [Monitored] by the watcher a.k.a [Monitor]
- */
-@JsExport
-@Serializable
-data class Monitored(
-    val uid: String,
-    val name: String,
-    val email: Email,
-    val logo: String? = null
-)
diff --git a/pi-monitor/pi-monitor-core/src/commonMain/kotlin/pimonitor/monitored/MonitoredBusiness.kt b/pi-monitor/pi-monitor-core/src/commonMain/kotlin/pimonitor/monitored/MonitoredBusiness.kt
new file mode 100644
index 00000000..fbfabe5c
--- /dev/null
+++ b/pi-monitor/pi-monitor-core/src/commonMain/kotlin/pimonitor/monitored/MonitoredBusiness.kt
@@ -0,0 +1,26 @@
+@file:JsExport
+
+package pimonitor.monitored
+
+import contacts.Email
+import kotlinx.serialization.Serializable
+import kotlin.js.JsExport
+
+@Serializable
+data class MonitoredBusiness(
+    val uid: String,
+    val name: String,
+    val contacts: List<ContactPerson>
+) {
+    init {
+        require(contacts.isNotEmpty()) { "A business must have at least one contact person" }
+    }
+
+    @Serializable
+    data class ContactPerson(
+        val uid: String,
+        val name: String,
+        val position: String,
+        val email: Email
+    )
+}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-core/src/commonMain/kotlin/pimonitor/monitors/CooperateMonitor.kt b/pi-monitor/pi-monitor-core/src/commonMain/kotlin/pimonitor/monitors/CooperateMonitor.kt
index 0be5beee..ff8785fc 100644
--- a/pi-monitor/pi-monitor-core/src/commonMain/kotlin/pimonitor/monitors/CooperateMonitor.kt
+++ b/pi-monitor/pi-monitor-core/src/commonMain/kotlin/pimonitor/monitors/CooperateMonitor.kt
@@ -2,6 +2,7 @@
 
 package pimonitor.monitors
 
+import bitframe.authentication.users.UserRef
 import contacts.Email
 import kotlinx.serialization.Serializable
 import kotlin.js.JsExport
@@ -11,7 +12,7 @@ import kotlin.js.JsName
 data class CooperateMonitor(
     override val uid: String,
     override val name: String,
-    override val email: Email,
+    val email: Email,
     val contacts: List<ContactPerson>
 ) : Monitor() {
     @JsName("with")
@@ -24,7 +25,9 @@ data class CooperateMonitor(
 
     @Serializable
     data class ContactPerson(
+        val uid: String,
         val name: String,
         val email: Email,
+        val userRef: UserRef
     )
 }
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-core/src/commonMain/kotlin/pimonitor/monitors/IndividualMonitor.kt b/pi-monitor/pi-monitor-core/src/commonMain/kotlin/pimonitor/monitors/IndividualMonitor.kt
index 3cb846cc..bc26abfb 100644
--- a/pi-monitor/pi-monitor-core/src/commonMain/kotlin/pimonitor/monitors/IndividualMonitor.kt
+++ b/pi-monitor/pi-monitor-core/src/commonMain/kotlin/pimonitor/monitors/IndividualMonitor.kt
@@ -2,6 +2,7 @@
 
 package pimonitor.monitors
 
+import bitframe.authentication.users.UserRef
 import contacts.Email
 import kotlinx.serialization.Serializable
 import kotlin.js.JsExport
@@ -10,5 +11,6 @@ import kotlin.js.JsExport
 data class IndividualMonitor(
     override val uid: String,
     override val name: String,
-    override val email: Email
+    val email: Email,
+    val userRef: UserRef
 ) : Monitor()
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-core/src/commonMain/kotlin/pimonitor/monitors/Monitor.kt b/pi-monitor/pi-monitor-core/src/commonMain/kotlin/pimonitor/monitors/Monitor.kt
index dc822d39..25dc4d41 100644
--- a/pi-monitor/pi-monitor-core/src/commonMain/kotlin/pimonitor/monitors/Monitor.kt
+++ b/pi-monitor/pi-monitor-core/src/commonMain/kotlin/pimonitor/monitors/Monitor.kt
@@ -2,7 +2,6 @@
 
 package pimonitor.monitors
 
-import contacts.Email
 import kotlinx.serialization.Serializable
 import kotlin.js.JsExport
 
@@ -10,5 +9,4 @@ import kotlin.js.JsExport
 sealed class Monitor {
     abstract val uid: String
     abstract val name: String
-    abstract val email: Email
 }
diff --git a/pi-monitor/pi-monitor-core/src/commonTest/kotlin/unit/monitors/MonitorsSerializationTest.kt b/pi-monitor/pi-monitor-core/src/commonTest/kotlin/unit/monitors/MonitorsSerializationTest.kt
index 0c8c5996..6cc20438 100644
--- a/pi-monitor/pi-monitor-core/src/commonTest/kotlin/unit/monitors/MonitorsSerializationTest.kt
+++ b/pi-monitor/pi-monitor-core/src/commonTest/kotlin/unit/monitors/MonitorsSerializationTest.kt
@@ -1,5 +1,7 @@
 package unit.monitors
 
+import bitframe.authentication.users.Contacts
+import bitframe.authentication.users.User
 import contacts.Email
 import kotlinx.serialization.json.Json
 import pimonitor.monitors.CooperateMonitor
@@ -8,12 +10,15 @@ import pimonitor.monitors.Monitor
 import kotlin.test.Test
 
 class MonitorsSerializationTest {
+    val userRef get() = User("", "", "", Contacts.None, null, spaces = listOf()).ref()
+
     @Test
     fun should_serialize_an_individual_monitor() {
         val monitor: Monitor = IndividualMonitor(
             uid = "none",
             name = "John Doe",
-            email = Email("john@doe.com")
+            email = Email("john@doe.com"),
+            userRef = userRef
         )
         val json = Json.encodeToString(Monitor.serializer(), monitor)
         println(json)
@@ -25,7 +30,7 @@ class MonitorsSerializationTest {
             uid = "none",
             name = "John Doe",
             email = Email("john@doe.com"),
-            person = CooperateMonitor.ContactPerson("Anderson", Email("anderson@test.com"))
+            person = CooperateMonitor.ContactPerson("", "Anderson", Email("anderson@test.com"), userRef)
         )
         val json = Json.encodeToString(Monitor.serializer(), monitor)
         println(json)
diff --git a/pi-monitor/pi-monitor-daos/core/src/commonMain/kotlin/pimonitor/monitored/MonitoredBusinessDao.kt b/pi-monitor/pi-monitor-daos/core/src/commonMain/kotlin/pimonitor/monitored/MonitoredBusinessDao.kt
new file mode 100644
index 00000000..bc0db3f9
--- /dev/null
+++ b/pi-monitor/pi-monitor-daos/core/src/commonMain/kotlin/pimonitor/monitored/MonitoredBusinessDao.kt
@@ -0,0 +1,7 @@
+package pimonitor.monitored
+
+import later.Later
+
+interface MonitoredBusinessDao {
+    fun all(): Later<List<MonitoredBusiness>>
+}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-daos/core/src/commonMain/kotlin/pimonitor/monitors/MonitorDao.kt b/pi-monitor/pi-monitor-daos/core/src/commonMain/kotlin/pimonitor/monitors/MonitorDao.kt
index 256a5e13..a3fbd35c 100644
--- a/pi-monitor/pi-monitor-daos/core/src/commonMain/kotlin/pimonitor/monitors/MonitorDao.kt
+++ b/pi-monitor/pi-monitor-daos/core/src/commonMain/kotlin/pimonitor/monitors/MonitorDao.kt
@@ -1,7 +1,10 @@
 package pimonitor.monitors
 
+import bitframe.authentication.users.UserRef
+import bitframe.daos.conditions.Condition
 import later.Later
 
 interface MonitorDao {
-    fun create(params: SignUpParams): Later<Monitor>
+    fun create(params: SignUpParams, ref: UserRef): Later<Monitor>
+    fun all(where: Condition<String, Any>?): Later<List<Monitor>>
 }
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-daos/core/src/commonMain/kotlin/pimonitor/monitors/SignUpParamsUtils.kt b/pi-monitor/pi-monitor-daos/core/src/commonMain/kotlin/pimonitor/monitors/SignUpParamsUtils.kt
index 1e5f702a..4e7986c3 100644
--- a/pi-monitor/pi-monitor-daos/core/src/commonMain/kotlin/pimonitor/monitors/SignUpParamsUtils.kt
+++ b/pi-monitor/pi-monitor-daos/core/src/commonMain/kotlin/pimonitor/monitors/SignUpParamsUtils.kt
@@ -1,5 +1,6 @@
 package pimonitor.monitors
 
+import bitframe.authentication.signin.SignInCredentials
 import bitframe.authentication.spaces.RegisterSpaceParams
 import bitframe.authentication.users.Contacts
 import bitframe.authentication.users.RegisterUserParams
@@ -16,4 +17,9 @@ fun SignUpParams.Business.toRegisterUserParams() = RegisterUserParams(
 
 fun SignUpParams.Business.toRegisterSpaceParams() = RegisterSpaceParams(
     name = businessName
-)
\ No newline at end of file
+)
+
+fun SignUpParams.toCredentials() = when (this) {
+    is SignUpParams.Individual -> SignInCredentials(email, password)
+    is SignUpParams.Business -> SignInCredentials(individualEmail, password)
+}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-daos/inmemory/src/commonMain/kotlin/pimonitor/monitored/MonitoredBusinessDaoInMemory.kt b/pi-monitor/pi-monitor-daos/inmemory/src/commonMain/kotlin/pimonitor/monitored/MonitoredBusinessDaoInMemory.kt
new file mode 100644
index 00000000..fdc3f73f
--- /dev/null
+++ b/pi-monitor/pi-monitor-daos/inmemory/src/commonMain/kotlin/pimonitor/monitored/MonitoredBusinessDaoInMemory.kt
@@ -0,0 +1,17 @@
+package pimonitor.monitored
+
+import bitframe.daos.config.InMemoryDaoConfig
+import kotlinx.coroutines.delay
+import later.Later
+import later.later
+
+class MonitoredBusinessDaoInMemory(
+    private val monitoredBusinesses: MutableMap<String, MonitoredBusiness> = mutableMapOf(),
+    private val config: InMemoryDaoConfig
+) : MonitoredBusinessDao {
+    private val scope = config.scope
+    override fun all(): Later<List<MonitoredBusiness>> = scope.later {
+        delay(config.simulationTime.toLong())
+        monitoredBusinesses.values.toList()
+    }
+}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-daos/inmemory/src/commonMain/kotlin/pimonitor/monitors/MonitorDaoInMemory.kt b/pi-monitor/pi-monitor-daos/inmemory/src/commonMain/kotlin/pimonitor/monitors/MonitorDaoInMemory.kt
index 84647554..5487f85e 100644
--- a/pi-monitor/pi-monitor-daos/inmemory/src/commonMain/kotlin/pimonitor/monitors/MonitorDaoInMemory.kt
+++ b/pi-monitor/pi-monitor-daos/inmemory/src/commonMain/kotlin/pimonitor/monitors/MonitorDaoInMemory.kt
@@ -1,5 +1,7 @@
 package pimonitor.monitors
 
+import bitframe.authentication.users.UserRef
+import bitframe.daos.conditions.Condition
 import bitframe.daos.config.InMemoryDaoConfig
 import contacts.Email
 import kotlinx.coroutines.delay
@@ -11,19 +13,21 @@ class MonitorDaoInMemory(
     val config: InMemoryDaoConfig
 ) : MonitorDao {
     private val scope = config.scope
-    override fun create(params: SignUpParams): Later<Monitor> = scope.later {
+    override fun create(params: SignUpParams, ref: UserRef) = scope.later {
         delay(config.simulationTime.toLong())
         val uid = "monitor-${monitors.size + 1}"
         val monitor = when (params) {
-            is SignUpParams.Individual -> IndividualMonitor(uid, params.name, Email(params.email))
+            is SignUpParams.Individual -> IndividualMonitor(uid, params.name, Email(params.email), ref)
             is SignUpParams.Business -> CooperateMonitor(
                 uid,
                 name = params.businessName,
                 email = Email(params.individualEmail),
                 contacts = listOf(
                     CooperateMonitor.ContactPerson(
+                        uid,
                         name = params.individualName,
-                        email = Email(params.individualEmail)
+                        email = Email(params.individualEmail),
+                        ref
                     )
                 )
             )
@@ -31,4 +35,16 @@ class MonitorDaoInMemory(
         monitors["monitor-${monitors.size + 1}"] = monitor
         monitor
     }
+
+    override fun all(where: Condition<String, Any>?) = scope.later {
+        if (where?.lhs == "userRef.uid") {
+            val uid = where.rhs.toString()
+            monitors.values.filter {
+                when (it) {
+                    is CooperateMonitor -> it.contacts.any { c -> c.userRef.uid == uid }
+                    is IndividualMonitor -> it.userRef.uid == uid
+                }
+            }
+        } else monitors.values.toList()
+    }
 }
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-server/src/main/kotlin/pimonitor/PiMonitorServer.kt b/pi-monitor/pi-monitor-server/src/main/kotlin/pimonitor/PiMonitorServer.kt
index e895d3f1..7d273f88 100644
--- a/pi-monitor/pi-monitor-server/src/main/kotlin/pimonitor/PiMonitorServer.kt
+++ b/pi-monitor/pi-monitor-server/src/main/kotlin/pimonitor/PiMonitorServer.kt
@@ -2,31 +2,39 @@ package pimonitor
 
 import bitframe.Application
 import bitframe.daos.config.InMemoryDaoConfig
+import bitframe.events.InMemoryEventBus
 import bitframe.server.modules.Module
-import bitframe.server.modules.authentication.AuthenticationService
 import bitframe.server.modules.authentication.AuthenticationModuleImpl
+import bitframe.server.modules.authentication.AuthenticationService
 import bitframe.service.config.ServiceConfig
 import pimonitor.authentication.signup.SignUpController
 import pimonitor.authentication.signup.SignUpModule
+import pimonitor.monitored.MonitoredBusiness
+import pimonitor.monitors.CooperateMonitor
+import pimonitor.monitors.IndividualMonitor
 import pimonitor.monitors.MonitorDaoInMemory
 import java.io.File
 
 fun PiMonitorServer(
     client: File,
     authService: AuthenticationService,
-) = Application(
-    client,
-    AuthenticationModuleImpl(authService),
-    listOf(
-        SignUpModule(
-            controller = SignUpController(
-                dao = MonitorDaoInMemory(config = InMemoryDaoConfig(0)),
-                config = ServiceConfig(""),
-                service = authService.users
-            )
-        ),
-        Module<Monitor>(),
-        Module<Monitor.Business>("monitor-businesses"),
-        Module<Monitored>(),
+): Application {
+    val bus = InMemoryEventBus()
+    return Application(
+        client,
+        AuthenticationModuleImpl(bus, authService),
+        listOf(
+            SignUpModule(
+                controller = SignUpController(
+                    dao = MonitorDaoInMemory(config = InMemoryDaoConfig(0)),
+                    config = ServiceConfig(""),
+                    service = authService.users,
+                    bus = bus
+                )
+            ),
+            Module<IndividualMonitor>(),
+            Module<CooperateMonitor>("monitor-businesses"),
+            Module<MonitoredBusiness>(),
+        )
     )
-)
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-server/src/main/kotlin/pimonitor/authentication/signup/SignUpController.kt b/pi-monitor/pi-monitor-server/src/main/kotlin/pimonitor/authentication/signup/SignUpController.kt
index 7bf03325..53667975 100644
--- a/pi-monitor/pi-monitor-server/src/main/kotlin/pimonitor/authentication/signup/SignUpController.kt
+++ b/pi-monitor/pi-monitor-server/src/main/kotlin/pimonitor/authentication/signup/SignUpController.kt
@@ -1,15 +1,21 @@
 package pimonitor.authentication.signup
 
 import bitframe.authentication.users.UsersService
+import bitframe.events.EventBus
 import bitframe.response.response.response
 import bitframe.server.http.HttpRequest
 import bitframe.server.http.compulsoryBody
 import bitframe.server.http.toHttpResponse
 import bitframe.service.config.ServiceConfig
+import io.ktor.http.HttpStatusCode.Companion.BadRequest
 import io.ktor.http.HttpStatusCode.Companion.Created
+import io.ktor.http.HttpStatusCode.Companion.InternalServerError
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import later.await
 import pimonitor.monitors.MonitorDao
+import pimonitor.monitors.SignUpParams
 
 private val json = Json {
     encodeDefaults = true
@@ -19,14 +25,29 @@ private val json = Json {
 class SignUpController(
     private val service: SignUpService
 ) {
-    constructor(config: ServiceConfig, service: UsersService, dao: MonitorDao) : this(SignUpServiceImpl(dao, service, config))
+    constructor(
+        config: ServiceConfig,
+        service: UsersService,
+        dao: MonitorDao,
+        bus: EventBus
+    ) : this(SignUpServiceImpl(dao, service, bus, config))
 
+    @OptIn(ExperimentalSerializationApi::class)
     suspend fun signUp(req: HttpRequest) = response {
-        val params = json.decodeFromString(
-            IndividualRegistrationParams.serializer(),
-            req.compulsoryBody()
-        )
-        val conundrum = service.registerIndividuallyAs(params).await()
+        val params = try {
+            json.decodeFromString<SignUpParams>(req.compulsoryBody())
+        } catch (err: Throwable) {
+            null
+        } ?: try {
+            json.decodeFromString<SignUpParams.Business>(req.compulsoryBody())
+        } catch (err: Throwable) {
+            null
+        } ?: try {
+            json.decodeFromString<SignUpParams.Individual>(req.compulsoryBody())
+        } catch (err: Throwable) {
+            reject(BadRequest, "Make sure you have the proper sign up params")
+        }
+        val conundrum = service.signUp(params).await()
         resolve(conundrum, Created)
     }.toHttpResponse()
 }
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-server/src/main/kotlin/pimonitor/main.kt b/pi-monitor/pi-monitor-server/src/main/kotlin/pimonitor/main.kt
index 4c661410..248dcfb9 100644
--- a/pi-monitor/pi-monitor-server/src/main/kotlin/pimonitor/main.kt
+++ b/pi-monitor/pi-monitor-server/src/main/kotlin/pimonitor/main.kt
@@ -1,5 +1,6 @@
 package pimonitor
 
+import bitframe.events.InMemoryEventBus
 import bitframe.server.InMemoryDaoProvider
 import bitframe.server.modules.authentication.AuthenticationServiceImpl
 import bitframe.service.config.ServiceConfig
@@ -8,7 +9,8 @@ import java.io.File
 fun main(args: Array<String>) {
     val provider = InMemoryDaoProvider() // MySQLProvider, MongoDBProvider
     val config = ServiceConfig("server-app")
-    val authModule = AuthenticationServiceImpl(provider, config)
+    val bus = InMemoryEventBus()
+    val authModule = AuthenticationServiceImpl(provider, config, bus)
     val client = File(args[0])
     val server = PiMonitorServer(client, authModule)
     server.start()
diff --git a/pi-monitor/pi-monitor-server/src/test/kotlin/core/authentication/signup/SignUpActionTest.kt b/pi-monitor/pi-monitor-server/src/test/kotlin/core/authentication/signup/SignUpActionTest.kt
index 69ddac5d..d1e0762a 100644
--- a/pi-monitor/pi-monitor-server/src/test/kotlin/core/authentication/signup/SignUpActionTest.kt
+++ b/pi-monitor/pi-monitor-server/src/test/kotlin/core/authentication/signup/SignUpActionTest.kt
@@ -4,6 +4,7 @@ import bitframe.*
 import bitframe.authentication.users.UsersService
 import bitframe.authentication.users.UsersServiceImpl
 import bitframe.daos.config.InMemoryDaoConfig
+import bitframe.events.InMemoryEventBus
 import bitframe.server.data.DAOProvider
 import bitframe.server.modules.authentication.AuthenticationService
 import bitframe.server.modules.authentication.AuthenticationServiceImpl
@@ -22,7 +23,8 @@ open class SignUpActionTest(component: ComponentUnderTest) {
         SignUpController(
             dao = MonitorDaoInMemory(config = InMemoryDaoConfig(0)),
             config = ServiceConfig(""),
-            service = service
+            service = service,
+            bus = InMemoryEventBus()
         )
     )
 
@@ -39,7 +41,7 @@ open class SignUpActionTest(component: ComponentUnderTest) {
         )
         val res = sandbox.post("/api/authentication/sign-up", body = params)
         res.body.printJson()
-        expect(res.body.contains("johndoe.com is not a valid email or phone")).toBe(true)
+        expect(res.body.contains("Invalid email: johndoe.com")).toBe(true)
     }
 
     @Test
diff --git a/pi-monitor/pi-monitor-server/src/test/kotlin/unit/utils/Configuration.kt b/pi-monitor/pi-monitor-server/src/test/kotlin/unit/utils/Configuration.kt
index 0e84b44e..a7a597e1 100644
--- a/pi-monitor/pi-monitor-server/src/test/kotlin/unit/utils/Configuration.kt
+++ b/pi-monitor/pi-monitor-server/src/test/kotlin/unit/utils/Configuration.kt
@@ -1,6 +1,7 @@
 package unit.utils
 
 import bitframe.ApplicationUnderTest
+import bitframe.events.InMemoryEventBus
 import bitframe.server.InMemoryDaoProvider
 import bitframe.server.modules.authentication.AuthenticationServiceImpl
 import bitframe.service.config.ServiceConfig
@@ -14,7 +15,9 @@ val SERVICE_CONFIG = ServiceConfig(
     "server-app"
 )
 
-val AUTH_SERVICE = AuthenticationServiceImpl(DAO_PROVIDER_UNDER_TEST, SERVICE_CONFIG)
+internal val BUS = InMemoryEventBus()
+
+val AUTH_SERVICE = AuthenticationServiceImpl(DAO_PROVIDER_UNDER_TEST, SERVICE_CONFIG, BUS)
 
 val SERVER = ApplicationUnderTest(
     PiMonitorServer(
diff --git a/pi-monitor/pi-monitor-services/core/build.gradle.kts b/pi-monitor/pi-monitor-services/core/build.gradle.kts
index 3d8c9fb3..c2cb65c9 100644
--- a/pi-monitor/pi-monitor-services/core/build.gradle.kts
+++ b/pi-monitor/pi-monitor-services/core/build.gradle.kts
@@ -15,6 +15,7 @@ kotlin {
             dependencies {
                 api(project(":pi-monitor-dao-core"))
                 api(project(":bitframe-client-sdk-core"))
+                api(project(":bitframe-events-inmemory"))
             }
         }
 
diff --git a/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/PiMonitorService.kt b/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/PiMonitorService.kt
index fa966651..b4775d7f 100644
--- a/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/PiMonitorService.kt
+++ b/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/PiMonitorService.kt
@@ -5,13 +5,18 @@ package pimonitor
 import bitframe.BitframeService
 import bitframe.authentication.signin.SignInService
 import bitframe.authentication.users.UsersService
+import bitframe.events.EventBus
+import bitframe.events.InMemoryEventBus
 import pimonitor.authentication.signup.SignUpService
-import pimonitor.evaluation.businesses.BusinessService
+import pimonitor.evaluation.businesses.BusinessesService
+import pimonitor.monitors.MonitorsService
 import kotlin.js.JsExport
 
 abstract class PiMonitorService(
     override val users: UsersService,
     override val signIn: SignInService,
     val signUp: SignUpService,
-    val businesses: BusinessService,
+    val monitors: MonitorsService,
+    val businesses: BusinessesService,
+    val bus: EventBus = InMemoryEventBus()
 ) : BitframeService
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/authentication/signup/IndividualRegistrationParams.kt b/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/authentication/signup/IndividualRegistrationParams.kt
deleted file mode 100644
index 8203ed0b..00000000
--- a/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/authentication/signup/IndividualRegistrationParams.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package pimonitor.authentication.signup
-
-import kotlinx.serialization.Serializable
-
-/**
- * Params for registering an individual
- *
- * Do not be fooled by the nullability of the parameters
- * they are nullable for interoperability reasons with js.
- */
-@Serializable
-data class IndividualRegistrationParams(
-    val name: String,
-    val email: String,
-    val password: String
-)
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/authentication/signup/IndividualRegistrationParamsUtils.kt b/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/authentication/signup/IndividualRegistrationParamsUtils.kt
deleted file mode 100644
index 350a29a4..00000000
--- a/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/authentication/signup/IndividualRegistrationParamsUtils.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package pimonitor.authentication.signup
-
-import bitframe.authentication.signin.SignInCredentials
-import bitframe.authentication.users.Contacts
-import bitframe.authentication.users.RegisterUserParams
-
-fun IndividualRegistrationParams.toRegisterUserParamsNew() = RegisterUserParams(
-    name = name,
-    contacts = Contacts.of(email),
-    password = password
-)
-
-fun IndividualRegistrationParams.credentials() = SignInCredentials(
-    alias = email,
-    password = password
-)
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/authentication/signup/MonitorBusinessParams.kt b/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/authentication/signup/MonitorBusinessParams.kt
deleted file mode 100644
index 19c602c2..00000000
--- a/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/authentication/signup/MonitorBusinessParams.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package pimonitor.authentication.signup
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class MonitorBusinessParams(
-    val name: String?,
-    val email: String?
-)
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/authentication/signup/MonitorBusinessParamsUtils.kt b/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/authentication/signup/MonitorBusinessParamsUtils.kt
deleted file mode 100644
index 8d423a2f..00000000
--- a/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/authentication/signup/MonitorBusinessParamsUtils.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package pimonitor.authentication.signup
-
-import contacts.Email
-import pimonitor.Monitor
-
-fun MonitorBusinessParams.toBusiness() = Monitor.Business(
-    name = name ?: throw IllegalArgumentException("Name must not be null"),
-    email = Email(email ?: throw IllegalArgumentException("Email must not be null"))
-)
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/authentication/signup/MonitorPersonParamsUtils.kt b/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/authentication/signup/MonitorPersonParamsUtils.kt
deleted file mode 100644
index aa96fe6b..00000000
--- a/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/authentication/signup/MonitorPersonParamsUtils.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package pimonitor.authentication.signup
-
-import contacts.Email
-import pimonitor.Monitor
-
-fun IndividualRegistrationParams.toPerson() = Monitor.Person(
-    name = name,
-    email = Email(email)
-)
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpResult.kt b/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpResult.kt
index c1c7e7d5..28c3ddc1 100644
--- a/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpResult.kt
+++ b/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpResult.kt
@@ -10,7 +10,7 @@ import pimonitor.monitors.Monitor
 import kotlin.js.JsExport
 
 @Serializable
-class SignUpResult(
+data class SignUpResult(
     val app: App,
     val space: Space,
     val user: User,
diff --git a/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpService.kt b/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpService.kt
index 6d9fb1be..377a20e7 100644
--- a/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpService.kt
+++ b/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpService.kt
@@ -2,38 +2,54 @@
 
 package pimonitor.authentication.signup
 
-import bitframe.authentication.signin.LoginConundrum
+import bitframe.events.Event
+import bitframe.events.EventBus
+import bitframe.service.config.ServiceConfig
 import contacts.Email
 import later.Later
-import pimonitor.Monitor
+import later.await
+import later.later
 import pimonitor.monitors.SignUpParams
 import kotlin.js.JsExport
 
-abstract class SignUpService {
-    fun validate(params: SignUpParams) {
-        when (params) {
-            is SignUpParams.Individual -> {
-                require(params.name.isNotEmpty()) {
-                    "Name must not be empty"
-                }
-                Email(params.email)
-                require(params.password.isNotEmpty()) {
-                    "Password must not be empty"
-                }
+abstract class SignUpService(
+    open val bus: EventBus,
+    open val config: ServiceConfig
+) {
+    protected val scope get() = config.scope
+
+    companion object {
+        const val SIGN_UP_EVENT_ID = "pimonitor.authentication.signup"
+        fun signUpEvent(data: SignUpResult) = Event(SIGN_UP_EVENT_ID, data)
+    }
+
+    fun validate(params: SignUpParams) = when (params) {
+        is SignUpParams.Individual -> {
+            require(params.name.isNotEmpty()) {
+                "Name must not be empty"
+            }
+            Email(params.email)
+            require(params.password.isNotEmpty()) {
+                "Password must not be empty"
             }
-            is SignUpParams.Business -> {
-                require(params.businessName.isNotEmpty() && params.individualName.isNotEmpty()) {
-                    "Name must not be empty"
-                }
-                Email(params.individualEmail)
-                require(params.password.isNotEmpty()) {
-                    "Password must not be empty"
-                }
+        }
+        is SignUpParams.Business -> {
+            require(params.businessName.isNotEmpty() && params.individualName.isNotEmpty()) {
+                "Name must not be empty"
+            }
+            Email(params.individualEmail)
+            require(params.password.isNotEmpty()) {
+                "Password must not be empty"
             }
         }
     }
 
-    abstract fun registerIndividuallyAs(person: IndividualRegistrationParams): Later<LoginConundrum>
-    abstract fun register(business: Monitor.Business, representedBy: Monitor.Person): Later<LoginConundrum>
-    abstract fun signUp(params: SignUpParams): Later<SignUpResult>
+    abstract fun executeSignUp(params: SignUpParams): Later<SignUpResult>
+
+    fun signUp(params: SignUpParams): Later<SignUpResult> = scope.later {
+        validate(params)
+        val result = executeSignUp(params).await()
+        bus.dispatch(signUpEvent(result))
+        result
+    }
 }
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpServiceImpl.kt b/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpServiceImpl.kt
index 9b5f46b1..a3fe4396 100644
--- a/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpServiceImpl.kt
+++ b/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpServiceImpl.kt
@@ -1,13 +1,12 @@
 package pimonitor.authentication.signup
 
 import bitframe.authentication.apps.App
-import bitframe.authentication.signin.LoginConundrum
 import bitframe.authentication.users.UsersService
+import bitframe.events.EventBus
 import bitframe.service.config.ServiceConfig
 import later.Later
 import later.await
 import later.later
-import pimonitor.Monitor
 import pimonitor.monitors.MonitorDao
 import pimonitor.monitors.SignUpParams
 import pimonitor.monitors.toRegisterSpaceParams
@@ -16,31 +15,19 @@ import pimonitor.monitors.toRegisterUserParams
 class SignUpServiceImpl(
     private val dao: MonitorDao,
     private val usersService: UsersService,
-    private val config: ServiceConfig
-) : SignUpService() {
-
-    private val scope = config.scope
-    override fun registerIndividuallyAs(
-        person: IndividualRegistrationParams
-    ) = usersService.register(person.toRegisterUserParamsNew())
-
-    override fun register(business: Monitor.Business, representedBy: Monitor.Person): Later<LoginConundrum> {
-        Monitor("<unset>", business, contacts = listOf(representedBy))
-        TODO()
-    }
-
-    override fun signUp(params: SignUpParams): Later<SignUpResult> = scope.later {
-        validate(params)
+    override val bus: EventBus,
+    override val config: ServiceConfig
+) : SignUpService(bus, config) {
+    override fun executeSignUp(params: SignUpParams): Later<SignUpResult> = scope.later {
         val register = when (params) {
             is SignUpParams.Individual -> usersService.register(params.toRegisterUserParams())
             is SignUpParams.Business -> usersService.registerWithSpace(
                 user = params.toRegisterUserParams(), space = params.toRegisterSpaceParams()
             )
-        }
-        val monitor = dao.create(params).await()
-        val conundrum = register.await()
+        }.await()
+        val monitor = dao.create(params, register.user.ref()).await()
         SignUpResult(
-            app = App(config.appId), space = conundrum.spaces.first(), user = conundrum.user, monitor = monitor
+            app = App(config.appId), space = register.spaces.first(), user = register.user, monitor = monitor
         )
     }
 }
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/evaluation/businesses/BusinessService.kt b/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/evaluation/businesses/BusinessService.kt
deleted file mode 100644
index 3e1c919d..00000000
--- a/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/evaluation/businesses/BusinessService.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-@file:JsExport
-
-package pimonitor.evaluation.businesses
-
-import later.Later
-import pimonitor.Monitor
-import kotlin.js.JsExport
-
-abstract class BusinessService {
-    abstract fun all(): Later<List<Monitor.Business>>
-}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/evaluation/businesses/BusinessServiceImpl.kt b/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/evaluation/businesses/BusinessServiceImpl.kt
index c2f9c1c7..83e64f3c 100644
--- a/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/evaluation/businesses/BusinessServiceImpl.kt
+++ b/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/evaluation/businesses/BusinessServiceImpl.kt
@@ -1,10 +1,11 @@
 package pimonitor.evaluation.businesses
 
 import later.Later
-import pimonitor.Monitor
+import pimonitor.monitored.MonitoredBusiness
+import pimonitor.monitored.MonitoredBusinessDao
 
-class BusinessServiceImpl : BusinessService() {
-    override fun all(): Later<List<Monitor.Business>> {
-        TODO("Not yet implemented")
-    }
+class BusinessServiceImpl(
+    private val dao: MonitoredBusinessDao,
+) : BusinessesService() {
+    override fun all(): Later<List<MonitoredBusiness>> = dao.all()
 }
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/evaluation/businesses/BusinessesService.kt b/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/evaluation/businesses/BusinessesService.kt
new file mode 100644
index 00000000..a209044b
--- /dev/null
+++ b/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/evaluation/businesses/BusinessesService.kt
@@ -0,0 +1,11 @@
+@file:JsExport
+
+package pimonitor.evaluation.businesses
+
+import later.Later
+import pimonitor.monitored.MonitoredBusiness
+import kotlin.js.JsExport
+
+abstract class BusinessesService {
+    abstract fun all(): Later<List<MonitoredBusiness>>
+}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/monitors/MonitorsService.kt b/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/monitors/MonitorsService.kt
new file mode 100644
index 00000000..82166f9b
--- /dev/null
+++ b/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/monitors/MonitorsService.kt
@@ -0,0 +1,30 @@
+@file:JsExport
+
+package pimonitor.monitors
+
+import bitframe.authentication.users.UserRef
+import bitframe.service.config.ServiceConfig
+import kotlinx.coroutines.launch
+import later.Later
+import later.await
+import live.Live
+import kotlin.js.JsExport
+import bitframe.authentication.signin.Session as SignInSession
+
+abstract class MonitorsService(
+    open val signInSession: Live<SignInSession>,
+    open val config: ServiceConfig
+) {
+    val session: Live<Session> = Live(Session.Unknown)
+    protected val scope get() = config.scope
+
+    protected fun watchSignInSession() = signInSession.watch {
+        scope.launch {
+            session.value = if (it is SignInSession.SignedIn) {
+                Session.Active(monitor(it.user.ref()).await())
+            } else Session.Unknown
+        }
+    }
+
+    abstract fun monitor(with: UserRef): Later<Monitor>
+}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/monitors/MonitorsServiceImpl.kt b/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/monitors/MonitorsServiceImpl.kt
new file mode 100644
index 00000000..a9b96c2d
--- /dev/null
+++ b/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/monitors/MonitorsServiceImpl.kt
@@ -0,0 +1,23 @@
+package pimonitor.monitors
+
+import bitframe.authentication.signin.Session
+import bitframe.authentication.users.UserRef
+import bitframe.daos.conditions.isEqualTo
+import bitframe.service.config.ServiceConfig
+import later.await
+import later.later
+import live.Live
+
+class MonitorsServiceImpl(
+    override val signInSession: Live<Session>,
+    private val dao: MonitorDao,
+    override val config: ServiceConfig
+) : MonitorsService(signInSession, config) {
+    init {
+        watchSignInSession()
+    }
+
+    override fun monitor(with: UserRef) = scope.later {
+        dao.all("userRef.uid" isEqualTo with.uid).await().first()
+    }
+}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/monitors/Session.kt b/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/monitors/Session.kt
new file mode 100644
index 00000000..b5ab4d26
--- /dev/null
+++ b/pi-monitor/pi-monitor-services/core/src/commonMain/kotlin/pimonitor/monitors/Session.kt
@@ -0,0 +1,10 @@
+@file:JsExport
+
+package pimonitor.monitors
+
+import kotlin.js.JsExport
+
+sealed class Session {
+    object Unknown : Session()
+    data class Active(val monitor: Monitor) : Session()
+}
diff --git a/pi-monitor/pi-monitor-services/ktor/src/commonMain/kotlin/pimonitor/PiMonitorServiceKtor.kt b/pi-monitor/pi-monitor-services/ktor/src/commonMain/kotlin/pimonitor/PiMonitorServiceKtor.kt
index 283d4ddc..e1dfd33d 100644
--- a/pi-monitor/pi-monitor-services/ktor/src/commonMain/kotlin/pimonitor/PiMonitorServiceKtor.kt
+++ b/pi-monitor/pi-monitor-services/ktor/src/commonMain/kotlin/pimonitor/PiMonitorServiceKtor.kt
@@ -2,15 +2,23 @@ package pimonitor
 
 import bitframe.authentication.signin.SignInServiceKtor
 import bitframe.authentication.users.UsersServiceKtor
+import bitframe.events.InMemoryEventBus
 import bitframe.service.config.KtorClientConfiguration
 import pimonitor.authentication.signup.SignUpServiceKtor
 import pimonitor.evaluation.businesses.BusinessServiceKtor
+import pimonitor.monitors.MonitorsServiceKtor
 
-class PiMonitorServiceKtor(
-    private val configuration: KtorClientConfiguration
-) : PiMonitorService(
-    users = UsersServiceKtor(configuration),
-    signIn = SignInServiceKtor(configuration),
-    signUp = SignUpServiceKtor(configuration),
-    businesses = BusinessServiceKtor((configuration))
-)
\ No newline at end of file
+fun PiMonitorServiceKtor(
+    configuration: KtorClientConfiguration
+): PiMonitorService {
+    val bus = InMemoryEventBus()
+    val signInService = SignInServiceKtor(configuration, bus)
+    return object : PiMonitorService(
+        users = UsersServiceKtor(configuration),
+        signIn = signInService,
+        signUp = SignUpServiceKtor(bus, configuration),
+        monitors = MonitorsServiceKtor(signInService.session, configuration),
+        businesses = BusinessServiceKtor((configuration)),
+        bus = bus
+    ) {}
+}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-services/ktor/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpServiceKtor.kt b/pi-monitor/pi-monitor-services/ktor/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpServiceKtor.kt
index c7ce46f2..53111ab1 100644
--- a/pi-monitor/pi-monitor-services/ktor/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpServiceKtor.kt
+++ b/pi-monitor/pi-monitor-services/ktor/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpServiceKtor.kt
@@ -1,37 +1,31 @@
 package pimonitor.authentication.signup
 
-import bitframe.authentication.signin.LoginConundrum
+import bitframe.events.EventBus
 import bitframe.response.response.decodeResponseFromString
 import bitframe.service.MiniService
 import bitframe.service.config.KtorClientConfiguration
 import bitframe.service.utils.JsonContent
+import io.ktor.client.features.*
 import io.ktor.client.request.*
+import io.ktor.client.statement.*
 import kotlinx.serialization.json.Json
 import later.Later
 import later.later
-import pimonitor.Monitor
 import pimonitor.monitors.SignUpParams
 
 class SignUpServiceKtor(
+    override val bus: EventBus,
     override val config: KtorClientConfiguration
-) : SignUpService(), MiniService {
+) : SignUpService(bus, config), MiniService {
     private val client = config.http
-    private val scope = config.scope
-    override fun registerIndividuallyAs(
-        person: IndividualRegistrationParams
-    ): Later<LoginConundrum> = scope.later {
-        val json = client.post<String>(config.url + "/api/authentication/sign-up") {
-            body = JsonContent(person)
-        }
-        val res = Json.decodeResponseFromString(LoginConundrum.serializer(), json)
-        res.response()
-    }
+    private val baseUrl = "${config.url}/api/authentication"
 
-    override fun register(business: Monitor.Business, representedBy: Monitor.Person): Later<LoginConundrum> {
-        TODO("Not yet implemented")
-    }
-
-    override fun signUp(params: SignUpParams): Later<SignUpResult> {
-        TODO("Not yet implemented")
+    override fun executeSignUp(params: SignUpParams): Later<SignUpResult> = scope.later {
+        val resp = try {
+            client.post("$baseUrl/sign-up") { body = JsonContent(params) }
+        } catch (err: ClientRequestException) {
+            err.response
+        }
+        Json.decodeResponseFromString(SignUpResult.serializer(), resp.readText()).response()
     }
 }
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-services/ktor/src/commonMain/kotlin/pimonitor/evaluation/businesses/BusinessServiceKtor.kt b/pi-monitor/pi-monitor-services/ktor/src/commonMain/kotlin/pimonitor/evaluation/businesses/BusinessServiceKtor.kt
index 28dce611..3c101b6a 100644
--- a/pi-monitor/pi-monitor-services/ktor/src/commonMain/kotlin/pimonitor/evaluation/businesses/BusinessServiceKtor.kt
+++ b/pi-monitor/pi-monitor-services/ktor/src/commonMain/kotlin/pimonitor/evaluation/businesses/BusinessServiceKtor.kt
@@ -2,12 +2,12 @@ package pimonitor.evaluation.businesses
 
 import bitframe.service.config.KtorClientConfiguration
 import later.Later
-import pimonitor.Monitor
+import pimonitor.monitored.MonitoredBusiness
 
 class BusinessServiceKtor(
     private val config: KtorClientConfiguration
-) : BusinessService() {
-    override fun all(): Later<List<Monitor.Business>> {
+) : BusinessesService() {
+    override fun all(): Later<List<MonitoredBusiness>> {
         TODO()
     }
 }
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-services/ktor/src/commonMain/kotlin/pimonitor/monitors/MonitorsServiceKtor.kt b/pi-monitor/pi-monitor-services/ktor/src/commonMain/kotlin/pimonitor/monitors/MonitorsServiceKtor.kt
new file mode 100644
index 00000000..ff9c5fef
--- /dev/null
+++ b/pi-monitor/pi-monitor-services/ktor/src/commonMain/kotlin/pimonitor/monitors/MonitorsServiceKtor.kt
@@ -0,0 +1,20 @@
+package pimonitor.monitors
+
+import bitframe.authentication.signin.Session
+import bitframe.authentication.users.UserRef
+import bitframe.service.config.ServiceConfig
+import later.Later
+import live.Live
+
+class MonitorsServiceKtor(
+    override val signInSession: Live<Session>,
+    override val config: ServiceConfig
+) : MonitorsService(signInSession, config) {
+    init {
+        watchSignInSession()
+    }
+
+    override fun monitor(with: UserRef): Later<Monitor> {
+        TODO("Not yet implemented")
+    }
+}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-services/stub/src/commonMain/kotlin/pimonitor/PiMonitorServiceStub.kt b/pi-monitor/pi-monitor-services/stub/src/commonMain/kotlin/pimonitor/PiMonitorServiceStub.kt
index bc54ac4c..6350c2b6 100644
--- a/pi-monitor/pi-monitor-services/stub/src/commonMain/kotlin/pimonitor/PiMonitorServiceStub.kt
+++ b/pi-monitor/pi-monitor-services/stub/src/commonMain/kotlin/pimonitor/PiMonitorServiceStub.kt
@@ -5,19 +5,28 @@ import bitframe.authentication.InMemoryAuthenticationDaoProvider
 import bitframe.authentication.signin.SignInServiceImpl
 import bitframe.authentication.users.UsersService
 import bitframe.authentication.users.UsersServiceImpl
-import bitframe.daos.config.InMemoryDaoConfig
-import bitframe.service.config.ServiceConfig
+import bitframe.events.InMemoryEventBus
 import pimonitor.authentication.signup.SignUpServiceImpl
 import pimonitor.evaluation.businesses.BusinessServiceImpl
+import pimonitor.monitored.MonitoredBusinessDaoInMemory
 import pimonitor.monitors.MonitorDaoInMemory
+import pimonitor.monitors.MonitorsServiceImpl
 
-class PiMonitorServiceStub(
+fun PiMonitorServiceStub(
     config: StubServiceConfig,
     provider: AuthenticationDaoProvider = InMemoryAuthenticationDaoProvider(config.toInMemoryDaoConfig()),
     usersService: UsersService = UsersServiceImpl(provider, config),
-) : PiMonitorService(
-    users = usersService,
-    signIn = SignInServiceImpl(provider, config),
-    signUp = SignUpServiceImpl(MonitorDaoInMemory(config = config.toInMemoryDaoConfig()), usersService, config),
-    businesses = BusinessServiceImpl()
-)
\ No newline at end of file
+): PiMonitorService {
+    val bus = InMemoryEventBus()
+    val signInService = SignInServiceImpl(provider, config, bus)
+    val daoConfig = config.toInMemoryDaoConfig()
+    val monitorDao = MonitorDaoInMemory(config = daoConfig)
+    return object : PiMonitorService(
+        users = usersService,
+        signIn = signInService,
+        signUp = SignUpServiceImpl(monitorDao, usersService, bus, config),
+        monitors = MonitorsServiceImpl(signInService.session, monitorDao, config),
+        businesses = BusinessServiceImpl(MonitoredBusinessDaoInMemory(config = daoConfig)),
+        bus = bus
+    ) {}
+}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-services/test/build.gradle.kts b/pi-monitor/pi-monitor-services/test/build.gradle.kts
index a3a384f5..a19ee820 100644
--- a/pi-monitor/pi-monitor-services/test/build.gradle.kts
+++ b/pi-monitor/pi-monitor-services/test/build.gradle.kts
@@ -2,7 +2,6 @@ plugins {
     kotlin("multiplatform")
     kotlin("plugin.serialization")
     id("tz.co.asoft.library")
-    id("org.jetbrains.dokka")
 }
 
 kotlin {
diff --git a/pi-monitor/pi-monitor-services/test/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpServiceTest.kt b/pi-monitor/pi-monitor-services/test/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpServiceTest.kt
index 44546b71..643bb51c 100644
--- a/pi-monitor/pi-monitor-services/test/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpServiceTest.kt
+++ b/pi-monitor/pi-monitor-services/test/src/commonMain/kotlin/pimonitor/authentication/signup/SignUpServiceTest.kt
@@ -5,6 +5,8 @@ import kotlinx.coroutines.runTest
 import kotlinx.datetime.Clock
 import later.await
 import pimonitor.PiMonitorService
+import pimonitor.monitors.SignUpParams
+import pimonitor.monitors.toCredentials
 import testing.IntegrationTest
 import testing.annotations.Lifecycle
 import testing.annotations.TestInstance
@@ -23,24 +25,21 @@ abstract class SignUpServiceTest : IntegrationTest() {
         val stamp = Clock.System.now().epochSeconds
 
         // Given an individual with
-        val individual = IndividualRegistrationParams(
+        val email = "andylamax$stamp@programmer.net"
+        val individual: SignUpParams = SignUpParams.Individual(
             name = "Anderson Lameck - $stamp",
-            email = "andylamax$stamp@programmer.net",
+            email = email,
             password = "1234"
         )
 
         // When they sign up
-        val signUpConundrum = service.signUp.registerIndividuallyAs(individual).await()
-        expect(signUpConundrum.spaces).toBeOfSize(1)
+        val result = service.signUp.signUp(individual).await()
 
         // They should be able to sign in
-        val singInConundrum = service.signIn.signIn(individual.credentials()).await()
+        val singInConundrum = service.signIn.signIn(individual.toCredentials()).await()
         expect(singInConundrum.spaces).toBeOfSize(1)
 
-        // the results return should be the same
-        expect(signUpConundrum).toBe(singInConundrum)
-
         // Their user tag should equal their username
-        expect(individual.name).toBe(signUpConundrum.user.tag)
+        expect(email).toBe(result.user.contacts.mapEachToString().first())
     }
 }
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-test/containers/build.gradle.kts b/pi-monitor/pi-monitor-test/containers/build.gradle.kts
deleted file mode 100644
index 1733172f..00000000
--- a/pi-monitor/pi-monitor-test/containers/build.gradle.kts
+++ /dev/null
@@ -1,28 +0,0 @@
-plugins {
-    kotlin("jvm")
-    `picortex-publish`
-}
-
-kotlin {
-    target {
-        library()
-    }
-
-    sourceSets {
-        val main by getting {
-            dependencies {
-                api(project(":bitframe-service-ktor"))
-//                api(project(":pi-monitor-test-testing"))
-                api("org.junit.jupiter:junit-jupiter-params:5.7.0")
-                api("org.testcontainers:testcontainers:${vers.testContainers}")
-                api("org.testcontainers:junit-jupiter:${vers.testContainers}")
-            }
-        }
-
-        val test by getting {
-            dependencies {
-                implementation(asoft("expect-coroutines", vers.asoft.expect))
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-test/containers/src/main/kotlin/testing/containers/ContainerTest.kt b/pi-monitor/pi-monitor-test/containers/src/main/kotlin/testing/containers/ContainerTest.kt
deleted file mode 100644
index c3654f85..00000000
--- a/pi-monitor/pi-monitor-test/containers/src/main/kotlin/testing/containers/ContainerTest.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package testing.containers
-
-import org.testcontainers.containers.GenericContainer
-import org.testcontainers.images.builder.ImageFromDockerfile
-import org.testcontainers.junit.jupiter.Container
-import java.nio.file.Path
-
-interface ContainerTest {
-    enum class TestMode {
-        DEV, CI, CD
-    }
-
-    companion object {
-        val mode = try {
-            TestMode.valueOf(System.getenv("TEST_MODE"))
-        } catch (err: Throwable) {
-            println("Couldn't get test mode. Defaulting to TEST_MODE=DEV")
-            TestMode.DEV
-        }
-
-        private val dockerFilePath get() = RootProjectDir.getPath() + "/pi-monitor/pi-monitor-server/build/binaries/Dockerfile"
-
-        private val dockerImage = ImageFromDockerfile()
-            .withDockerfile(Path.of(dockerFilePath))
-
-        @Container
-        private val container: GenericContainer<*> = GenericDisableableContainer<Nothing>(dockerImage!!).apply {
-            withExposedPorts(8080)
-            isActive(mode == TestMode.CI)
-        }
-
-        val urlUnderTest
-            get() = when (mode) {
-                TestMode.DEV -> "http://localhost:8080"
-                TestMode.CI -> "http://${container.containerIpAddress}:${container.firstMappedPort}"
-                TestMode.CD -> TODO("Setup CD environment to run tests before release")
-            }
-    }
-}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-test/containers/src/main/kotlin/testing/containers/GenericDisableableContainer.kt b/pi-monitor/pi-monitor-test/containers/src/main/kotlin/testing/containers/GenericDisableableContainer.kt
deleted file mode 100644
index 55336014..00000000
--- a/pi-monitor/pi-monitor-test/containers/src/main/kotlin/testing/containers/GenericDisableableContainer.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package testing.containers
-
-import org.testcontainers.containers.GenericContainer
-import org.testcontainers.images.builder.ImageFromDockerfile
-
-class GenericDisableableContainer<T : GenericDisableableContainer<T>?>(
-    imageFromDockerfile: ImageFromDockerfile
-) : GenericContainer<T>(imageFromDockerfile) {
-    private var isActive = false
-
-    override fun start() {
-        if (isActive) {
-            super.start()
-        }
-    }
-
-    fun isActive(isActive: Boolean): GenericDisableableContainer<*> {
-        this.isActive = isActive
-        return this
-    }
-}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-test/containers/src/main/kotlin/testing/containers/IntegrationTest.kt b/pi-monitor/pi-monitor-test/containers/src/main/kotlin/testing/containers/IntegrationTest.kt
deleted file mode 100644
index 971baac8..00000000
--- a/pi-monitor/pi-monitor-test/containers/src/main/kotlin/testing/containers/IntegrationTest.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package testing.containers
-
-import bitframe.service.config.KtorClientConfiguration
-import testing.containers.ContainerTest.Companion.mode
-import testing.containers.ContainerTest.Companion.urlUnderTest
-import testing.containers.ContainerTest.TestMode.*
-
-open class IntegrationTest : ContainerTest {
-    val config
-        get() = when (mode) {
-            DEV -> KtorClientConfiguration(
-                url = "http://localhost:8080",
-                appId = "dev-app-1"
-            )
-            CI -> KtorClientConfiguration(
-                url = urlUnderTest,
-                appId = "ci-app-1"
-            )
-            CD -> TODO()
-        }
-}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-test/containers/src/main/kotlin/testing/containers/RootProjectDir.kt b/pi-monitor/pi-monitor-test/containers/src/main/kotlin/testing/containers/RootProjectDir.kt
deleted file mode 100644
index 38c4cf91..00000000
--- a/pi-monitor/pi-monitor-test/containers/src/main/kotlin/testing/containers/RootProjectDir.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package testing.containers
-
-import kotlin.io.path.Path
-import kotlin.io.path.absolutePathString
-
-class RootProjectDir {
-    companion object {
-        fun getPath(): String = parse(Path(".").absolutePathString())
-
-        fun parse(path: String): String = if (path.contains("/bitframe/bitframe/")) {
-            val parentDir = path.split("/bitframe/bitframe/")
-            parentDir.first() + "/bitframe/bitframe"
-        } else {
-            val parentDir = path.split("/bitframe/")
-            parentDir.first() + "/bitframe"
-        }
-    }
-}
\ No newline at end of file
diff --git a/pi-monitor/pi-monitor-test/containers/src/test/kotlin/RootProjectDirTest.kt b/pi-monitor/pi-monitor-test/containers/src/test/kotlin/RootProjectDirTest.kt
deleted file mode 100644
index d3ce1cc1..00000000
--- a/pi-monitor/pi-monitor-test/containers/src/test/kotlin/RootProjectDirTest.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-import expect.expect
-import testing.containers.RootProjectDir
-import kotlin.test.Test
-
-class RootProjectDirTest {
-
-    @Test
-    fun should_return_the_root_project_path() {
-        val validPath = "/media/andylamax/workspace/PiCortex/bitframe"
-        val hypotheticalPath = "$validPath/people/test"
-        expect(validPath).toBe(RootProjectDir.parse(hypotheticalPath))
-    }
-
-    @Test
-    fun should_be_able_to_parse_in_any_environment() {
-        val validPath = "/home/runner/work/bitframe/bitframe"
-        val ciPath = "$validPath/bitframe-client/sdks/core/src/commonMain/kotlin/bitframe/authentication/"
-        expect(validPath).toBe(RootProjectDir.parse(ciPath))
-    }
-}
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index eb93455e..940e3349 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -51,7 +51,7 @@ includeSubs(base = "bitframe-client-sdk", path = "bitframe-client/sdks", "core",
 
 includeSubs(base = "bitframe-client", path = "bitframe-client", "viewmodels")
 
-includeSubs(base = "bitframe-events", path = "bitframe-events", "core", "inmemory")
+includeSubs(base = "bitframe-events", path = "bitframe-events", "core", "inmemory", "react")
 
 includeSubs(base = "bitframe-ui", path = "bitframe-client/ui", "react")