From 9ccdddb365c2666ae8c830503e72687313d0fe32 Mon Sep 17 00:00:00 2001
From: Elijah Mooring <vehmloewff@gmail.com>
Date: Wed, 30 Oct 2024 13:57:37 -0500
Subject: [PATCH] wip: stash last night's work

---
 .../java/com/example/objectionapp/Bridge.kt   |  401 ++--
 .../java/com/example/objectionapp/CardView.kt |  236 --
 .../com/example/objectionapp/Constants.kt     |    2 +
 .../com/example/objectionapp/ContentView.kt   |  491 ----
 .../com/example/objectionapp/Controller.kt    |    6 +-
 .../java/com/example/objectionapp/FormView.kt |  516 ++---
 .../com/example/objectionapp/GetSchema.kt     |    4 +-
 .../java/com/example/objectionapp/Layout.kt   |  156 +-
 .../java/com/example/objectionapp/ListView.kt |  194 +-
 .../com/example/objectionapp/Navigation.kt    |   28 +
 .../java/com/example/objectionapp/ObjectId.kt |    4 +-
 .../java/com/example/objectionapp/Page.kt     |  394 ++--
 .../com/example/objectionapp/Providers.kt     |   44 +-
 .../java/com/example/objectionapp/Schema.kt   |    2 +-
 .../com/example/objectionapp/StandardIcon.kt  |   40 -
 .../java/com/example/objectionapp/TabBar.kt   |  714 +++---
 .../java/com/example/objectionapp/View.kt     |  391 ++--
 .../com/example/objectionapp/view/AppBar.kt   |  281 +++
 .../java/com/example/objectionapp/view/Box.kt |   39 +
 .../com/example/objectionapp/view/Button.kt   |   38 +
 .../com/example/objectionapp/view/Center.kt   |   42 +
 .../com/example/objectionapp/view/Flex.kt     |  243 ++
 .../com/example/objectionapp/view/Icon.kt     |   41 +
 .../com/example/objectionapp/view/Image.kt    |   68 +
 .../com/example/objectionapp/view/Main.kt     |   32 +
 .../example/objectionapp/view/PageToggle.kt   |   87 +
 .../com/example/objectionapp/view/Stack.kt    |   22 +
 .../com/example/objectionapp/view/Style.kt    |  109 +
 .../com/example/objectionapp/view/Surface.kt  |   54 +
 .../com/example/objectionapp/view/Text.kt     |  114 +
 .../example/objectionapp/view/ThemeColor.kt   |   65 +
 objection_deploy.ts                           |    4 +
 schema.json                                   | 1988 +----------------
 33 files changed, 2710 insertions(+), 4140 deletions(-)
 delete mode 100644 app/src/main/java/com/example/objectionapp/CardView.kt
 delete mode 100644 app/src/main/java/com/example/objectionapp/ContentView.kt
 create mode 100644 app/src/main/java/com/example/objectionapp/Navigation.kt
 create mode 100644 app/src/main/java/com/example/objectionapp/view/AppBar.kt
 create mode 100644 app/src/main/java/com/example/objectionapp/view/Box.kt
 create mode 100644 app/src/main/java/com/example/objectionapp/view/Button.kt
 create mode 100644 app/src/main/java/com/example/objectionapp/view/Center.kt
 create mode 100644 app/src/main/java/com/example/objectionapp/view/Flex.kt
 create mode 100644 app/src/main/java/com/example/objectionapp/view/Icon.kt
 create mode 100644 app/src/main/java/com/example/objectionapp/view/Image.kt
 create mode 100644 app/src/main/java/com/example/objectionapp/view/Main.kt
 create mode 100644 app/src/main/java/com/example/objectionapp/view/PageToggle.kt
 create mode 100644 app/src/main/java/com/example/objectionapp/view/Stack.kt
 create mode 100644 app/src/main/java/com/example/objectionapp/view/Style.kt
 create mode 100644 app/src/main/java/com/example/objectionapp/view/Surface.kt
 create mode 100644 app/src/main/java/com/example/objectionapp/view/Text.kt
 create mode 100644 app/src/main/java/com/example/objectionapp/view/ThemeColor.kt

diff --git a/app/src/main/java/com/example/objectionapp/Bridge.kt b/app/src/main/java/com/example/objectionapp/Bridge.kt
index a2a2596..545d66e 100644
--- a/app/src/main/java/com/example/objectionapp/Bridge.kt
+++ b/app/src/main/java/com/example/objectionapp/Bridge.kt
@@ -26,215 +26,218 @@ import java.net.UnknownHostException
 import kotlin.math.log
 
 class Bridge(private var logger: Logger, private var session: Session) : CoroutineScope {
-    private var job: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = Dispatchers.Main + job
-
-    var onError = Listener<String>(logger = logger)
-    var onHasInternet = Listener<Boolean>(logger = logger)
-    var onObjectSet = Listener<Pair<String, JsonElement>>(logger = logger)
-    var onObjectRemoved = Listener<String>(logger = logger)
-
-    private var isOffline = false
-    private var url: String? = null
-    private var websocket: WebSocket? = null
-    private var isRunning = false
-    private val client = OkHttpClient()
-    private val json = Json { ignoreUnknownKeys = true; isLenient = true; encodeDefaults = true }
-    private val outgoingMessages = mutableMapOf<String, () -> Unit>()
-
-    fun start(url: String) {
-        if (!isRunning) {
-            logger.info("starting")
-
-            this.websocket
-            val fullUrl = "$url?session_id=${session.getId()}"
-            this.url = fullUrl
-            connect()
-        } else {
-            logger.info("start called again, but skipping because bridge is already running")
-        }
-    }
-
-    fun watch(objectId: String, onComplete: () -> Unit) {
-        sendMessage(
-            OutgoingMessage.Watch(
-                requestId = listenForAcknowledgement(onComplete),
-                id = objectId,
-            )
-        )
-    }
-
-    fun unwatch(objectId: String, onComplete: () -> Unit) {
-        sendMessage(
-            OutgoingMessage.Unwatch(
-                requestId = listenForAcknowledgement(onComplete),
-                id = objectId,
-            )
-        )
-    }
-
-    fun emitBindingUpdate(key: String, data: JsonElement, onComplete: () -> Unit) {
-        sendMessage(
-            OutgoingMessage.EmitBindingUpdate(
-                requestId = listenForAcknowledgement(onComplete),
-                key = key,
-                data = data
-            )
-        )
-    }
-
-    private fun listenForAcknowledgement(callback: () -> Unit): String {
-        val id = UUID.randomUUID().toString()
-        outgoingMessages[id] = callback
-
-        return id
-    }
-
-    private fun acknowledge(requestId: String?, error: String?) {
-        if (error != null) {
-            logger.error(error)
-            onError.emit(error)
-        }
-
-        if (requestId != null) {
-            val callback = outgoingMessages[requestId]
-            if (callback != null) callback()
-
-            outgoingMessages.remove(requestId)
-        }
-    }
-
-    private fun callError(message: String) {
-        onError.emit(message)
-    }
-
-    private fun sendMessage(message: OutgoingMessage) {
-        websocket?.let { ws ->
-            val jsonMessage = json.encodeToString(OutgoingMessage.serializer(), message)
-            ws.send(jsonMessage)
-        } ?: logger.error("must call start() before watch() or fireEvent()")
-    }
-
-    private fun parseIncomingJson(data: String): List<IncomingMessage> {
-        return try {
-            json.decodeFromString(data)
-        } catch (e: Exception) {
-            callError("Failed to parse information from server.")
-            logger.critical("failed to parse json of incoming message: ${e.message}. JSON: $data")
-
-            emptyList()
-        }
-    }
-
-    private fun queueRetry() {
-        websocket?.cancel()
-
-        Executors.newSingleThreadScheduledExecutor().schedule({
-            logger.info("retrying websocket connection")
-            connect()
-        }, 3, TimeUnit.SECONDS)
-    }
-
-    private fun connect() {
-        logger.info("connecting")
-
-        val url = url ?: run {
-            logger.error("must call .start() before .connect()")
-            return
-        }
-
-        val request = Request.Builder().url(url).build()
-        websocket = client.newWebSocket(request, object : WebSocketListener() {
-            override fun onOpen(webSocket: WebSocket, response: Response) {
-                isRunning = true
-
-                if (isOffline) {
-                    logger.info("websocket connected")
-                    isOffline = false
-                    onHasInternet.emit(true)
-                }
-            }
-
-            override fun onMessage(webSocket: WebSocket, text: String) {
-                parseIncomingJson(text).forEach { handleIncomingMessage(it) }
-            }
-
-            override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
-                when (t) {
-                    is ConnectException, is SocketTimeoutException, is UnknownHostException -> {
-                        isOffline = true
-                        onHasInternet.emit(false)
-                        queueRetry()
-                    }
-
-                    is EOFException -> {
-                        logger.warn("connection was suddenly dropped")
-                        queueRetry()
-                    }
-
-                    else -> {
-                        logger.warn("a socket failed: $t")
-                        callError(t.localizedMessage ?: "Unknown error")
-                    }
-                }
-            }
-        })
-    }
-
-    private fun handleIncomingMessage(message: IncomingMessage) {
-        when (message) {
-            is IncomingMessage.RemoveObject -> onObjectRemoved.emit(message.id)
-            is IncomingMessage.SetObject -> onObjectSet.emit(Pair(message.id, message.data))
-            is IncomingMessage.Acknowledge -> acknowledge(message.requestId, message.error)
-        }
-    }
+	private var job: Job = Job()
+	override val coroutineContext: CoroutineContext
+		get() = Dispatchers.Main + job
+
+	var onError = Listener<String>(logger = logger)
+	var onHasInternet = Listener<Boolean>(logger = logger)
+	var onObjectSet = Listener<Pair<String, JsonElement>>(logger = logger)
+	var onObjectRemoved = Listener<String>(logger = logger)
+
+	private var retryCounter = 0;
+	private var isOffline = false
+	private var url: String? = null
+	private var websocket: WebSocket? = null
+	private var isRunning = false
+	private val client = OkHttpClient()
+	private val json = Json { ignoreUnknownKeys = true; isLenient = true; encodeDefaults = true }
+	private val outgoingMessages = mutableMapOf<String, () -> Unit>()
+
+	fun start(url: String) {
+		if (!isRunning) {
+			logger.info("starting")
+
+			this.websocket
+			val fullUrl = "$url?session_id=${session.getId()}"
+			this.url = fullUrl
+			connect()
+		} else {
+			logger.info("start called again, but skipping because bridge is already running")
+		}
+	}
+
+	fun watch(objectId: String, onComplete: () -> Unit) {
+		sendMessage(
+			OutgoingMessage.Watch(
+				requestId = listenForAcknowledgement(onComplete),
+				id = objectId,
+			)
+		)
+	}
+
+	fun unwatch(objectId: String, onComplete: () -> Unit) {
+		sendMessage(
+			OutgoingMessage.Unwatch(
+				requestId = listenForAcknowledgement(onComplete),
+				id = objectId,
+			)
+		)
+	}
+
+	fun emitBindingUpdate(key: String, data: JsonElement, onComplete: () -> Unit) {
+		sendMessage(
+			OutgoingMessage.EmitBindingUpdate(
+				requestId = listenForAcknowledgement(onComplete), key = key, data = data
+			)
+		)
+	}
+
+	private fun listenForAcknowledgement(callback: () -> Unit): String {
+		val id = UUID.randomUUID().toString()
+		outgoingMessages[id] = callback
+
+		return id
+	}
+
+	private fun acknowledge(requestId: String?, error: String?) {
+		if (error != null) {
+			logger.error(error)
+			onError.emit(error)
+		}
+
+		if (requestId != null) {
+			val callback = outgoingMessages[requestId]
+			if (callback != null) callback()
+
+			outgoingMessages.remove(requestId)
+		}
+	}
+
+	private fun callError(message: String) {
+		onError.emit(message)
+	}
+
+	private fun sendMessage(message: OutgoingMessage) {
+		websocket?.let { ws ->
+			val jsonMessage = json.encodeToString(OutgoingMessage.serializer(), message)
+			ws.send(jsonMessage)
+		} ?: logger.error("must call start() before watch() or fireEvent()")
+	}
+
+	private fun parseIncomingJson(data: String): List<IncomingMessage> {
+		return try {
+			json.decodeFromString(data)
+		} catch (e: Exception) {
+			callError("Failed to parse information from server.")
+			logger.critical("failed to parse json of incoming message: ${e.message}. JSON: $data")
+
+			emptyList()
+		}
+	}
+
+	private fun queueRetry() {
+		websocket?.cancel()
+		retryCounter += 1;
+
+		Executors.newSingleThreadScheduledExecutor().schedule({
+			logger.info("retrying websocket connection")
+			connect()
+		}, 3, TimeUnit.SECONDS)
+	}
+
+	private fun connect() {
+		logger.info("connecting")
+
+		val url = url ?: run {
+			logger.error("must call .start() before .connect()")
+			return
+		}
+
+		val request = Request.Builder().url(url).build()
+		websocket = client.newWebSocket(request, object : WebSocketListener() {
+			override fun onOpen(webSocket: WebSocket, response: Response) {
+				isRunning = true
+
+				if (isOffline) {
+					logger.info("websocket connected")
+					retryCounter = 0
+					isOffline = false
+					onHasInternet.emit(true)
+				}
+			}
+
+			override fun onMessage(webSocket: WebSocket, text: String) {
+				parseIncomingJson(text).forEach { handleIncomingMessage(it) }
+			}
+
+			override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
+				when (t) {
+					is ConnectException, is SocketTimeoutException, is UnknownHostException -> {
+						if (retryCounter > 5 && !isOffline) {
+							isOffline = true
+							onHasInternet.emit(false)
+						}
+
+						println("retrying, counter is at $retryCounter")
+						queueRetry()
+					}
+
+					is EOFException -> {
+						logger.warn("connection was suddenly dropped")
+						queueRetry()
+					}
+
+					else -> {
+						logger.warn("a socket failed: $t")
+						callError(t.localizedMessage ?: "Unknown error")
+					}
+				}
+			}
+		})
+	}
+
+	private fun handleIncomingMessage(message: IncomingMessage) {
+		logger.info("received message from server: $message")
+
+		when (message) {
+			is IncomingMessage.RemoveObject -> onObjectRemoved.emit(message.id)
+			is IncomingMessage.SetObject -> onObjectSet.emit(Pair(message.id, message.data))
+			is IncomingMessage.Acknowledge -> acknowledge(message.requestId, message.error)
+		}
+	}
 }
 
 @OptIn(ExperimentalSerializationApi::class)
 @Serializable
 @JsonClassDiscriminator("$")
 sealed class OutgoingMessage {
-    @Serializable
-    @SerialName("watch")
-    data class Watch(
-        @SerialName("request_id") val requestId: String,
-        val id: String
-    ) : OutgoingMessage()
-
-    @Serializable
-    @SerialName("unwatch")
-    data class Unwatch(
-        @SerialName("request_id") val requestId: String,
-        val id: String
-    ) : OutgoingMessage()
-
-    @Serializable
-    @SerialName("emit_binding_update")
-    data class EmitBindingUpdate(
-        @SerialName("request_id") val requestId: String,
-        val key: String,
-        val data: JsonElement
-    ) : OutgoingMessage()
+	@Serializable
+	@SerialName("watch")
+	data class Watch(
+		@SerialName("request_id") val requestId: String, val id: String
+	) : OutgoingMessage()
+
+	@Serializable
+	@SerialName("unwatch")
+	data class Unwatch(
+		@SerialName("request_id") val requestId: String, val id: String
+	) : OutgoingMessage()
+
+	@Serializable
+	@SerialName("emit_binding_update")
+	data class EmitBindingUpdate(
+		@SerialName("request_id") val requestId: String, val key: String, val data: JsonElement
+	) : OutgoingMessage()
 }
 
 @OptIn(ExperimentalSerializationApi::class)
 @Serializable
 @JsonClassDiscriminator("$")
 sealed class IncomingMessage {
-    @Serializable
-    @SerialName("remove_object")
-    data class RemoveObject(val id: String) : IncomingMessage()
-
-    @Serializable
-    @SerialName("set_object")
-    data class SetObject(val id: String, val data: JsonElement) : IncomingMessage()
-
-    @Serializable
-    @SerialName("acknowledge")
-    data class Acknowledge(
-        @SerialName("request_id") val requestId: String? = null,
-        val error: String? = null,
-        @SerialName("retry_after_seconds") val retryAfterSeconds: Int? = null
-    ) : IncomingMessage()
+	@Serializable
+	@SerialName("remove_object")
+	data class RemoveObject(val id: String) : IncomingMessage()
+
+	@Serializable
+	@SerialName("set_object")
+	data class SetObject(val id: String, val data: JsonElement) : IncomingMessage()
+
+	@Serializable
+	@SerialName("acknowledge")
+	data class Acknowledge(
+		@SerialName("request_id") val requestId: String? = null,
+		val error: String? = null,
+		@SerialName("retry_after_seconds") val retryAfterSeconds: Int? = null
+	) : IncomingMessage()
 }
diff --git a/app/src/main/java/com/example/objectionapp/CardView.kt b/app/src/main/java/com/example/objectionapp/CardView.kt
deleted file mode 100644
index 7b7ad1d..0000000
--- a/app/src/main/java/com/example/objectionapp/CardView.kt
+++ /dev/null
@@ -1,236 +0,0 @@
-package com.example.objectionapp
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.LazyRow
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardColors
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarScrollBehavior
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import coil.compose.AsyncImage
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class CardViewOptions(
-	val excessiveRounding: Boolean = false,
-	val useCardPadding: Boolean = false,
-)
-
-@Serializable
-@SerialName("CardView")
-data class CardView(
-	val options: CardViewOptions,
-	val containers: List<CardContainer> = listOf(),
-) : View()
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun CardViewRender(view: CardView, scrollBehavior: TopAppBarScrollBehavior) {
-	LazyColumn(
-		modifier = Modifier
-			.padding(bottom = 90.dp)
-			.nestedScroll(scrollBehavior.nestedScrollConnection),
-		verticalArrangement = Arrangement.spacedBy(10.dp),
-	) {
-		view.containers.map {
-			item {
-				when (it) {
-					is CardContainer.SingularCardContainer -> CardRender(
-						it.objectId,
-						isVertical = false,
-						viewOptions = view.options,
-					)
-
-					is CardContainer.PluralCardContainer -> {
-						Box(
-							modifier = Modifier
-								.background(color = MaterialTheme.colorScheme.surfaceVariant)
-								.fillMaxWidth()
-						) {
-							LazyRow(
-								modifier = Modifier
-									.nestedScroll(scrollBehavior.nestedScrollConnection)
-									.fillMaxWidth()
-							) {
-								item {
-									it.objectIds.map {
-										CardRender(
-											it, isVertical = true, viewOptions = view.options
-										)
-									}
-								}
-							}
-						}
-					}
-
-					is CardContainer.CustomCardContainer -> return@item
-				}
-			}
-		}
-	}
-}
-
-@Composable
-private fun CardRender(
-	pageId: String,
-	isVertical: Boolean,
-	viewOptions: CardViewOptions,
-) {
-	val page = usePage(pageId)
-	val navController = useNavController()
-
-	var rootModifier: Modifier = Modifier
-	var bodyModifier: Modifier = Modifier
-
-	rootModifier = if (isVertical) rootModifier.width(140.dp) else rootModifier.fillMaxWidth()
-	rootModifier =
-		if (viewOptions.excessiveRounding) rootModifier.clip(RoundedCornerShape(20.dp)) else rootModifier
-	rootModifier = if (viewOptions.useCardPadding) rootModifier.padding(10.dp) else rootModifier
-
-	bodyModifier = if (viewOptions.useCardPadding) bodyModifier else bodyModifier.padding(10.dp)
-
-	Card(
-		modifier = rootModifier,
-		elevation = CardDefaults.elevatedCardElevation(defaultElevation = 5.dp),
-		colors = CardColors(
-			containerColor = MaterialTheme.colorScheme.surfaceContainer,
-			contentColor = MaterialTheme.colorScheme.onSurface,
-			disabledContentColor = MaterialTheme.colorScheme.onSurfaceVariant,
-			disabledContainerColor = MaterialTheme.colorScheme.surfaceVariant
-		),
-		onClick = {
-			navController.navigate(route = encodeObjectIdIntoPageRoute(pageId))
-		},
-	) {
-		if (page == null) {
-			// TODO: skeleton loader here
-		} else {
-			Row(
-				modifier = bodyModifier
-					.fillMaxWidth()
-					.fillMaxHeight()
-					.padding(10.dp),
-				horizontalArrangement = Arrangement.spacedBy(10.dp),
-				verticalAlignment = Alignment.Top
-			) {
-				if (page.type is PageType.Post) {
-					page.type.imageUrls?.getOrNull(0)?.let {
-						AsyncImage(
-							model = it,
-							contentDescription = "An image",
-							clipToBounds = true,
-							contentScale = ContentScale.Crop,
-							modifier = Modifier
-								.width(110.dp)
-								.height(110.dp)
-								.clip(RoundedCornerShape(12.dp))
-						)
-					}
-				}
-
-				Column(
-					verticalArrangement = Arrangement.SpaceAround
-				) {
-					if (page.type is PageType.Post) {
-						page.type.supertitle?.let {
-							Text(
-								it,
-								color = MaterialTheme.colorScheme.onSurface,
-								fontSize = 10.sp,
-								fontWeight = FontWeight.SemiBold,
-							)
-						}
-					}
-
-					page.title?.let {
-						Text(
-							it,
-							color = MaterialTheme.colorScheme.onSurface,
-							fontSize = 16.sp,
-						)
-					}
-
-					page.subtitle?.let {
-						Text(
-							it, fontSize = 12.sp, color = MaterialTheme.colorScheme.secondary
-						)
-					}
-
-					if (page.type is PageType.Post) {
-						page.type.additionalInfo?.let {
-							Text(
-								it,
-								fontSize = 14.sp,
-								color = MaterialTheme.colorScheme.onSurface,
-								fontWeight = FontWeight.SemiBold
-							)
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
-@Preview
-@Composable
-fun CardViewTest() {
-	val controller = Controller.fromConstants()
-
-	controller.objectStore.preload(defaultThemeId, Theme())
-	controller.objectStore.preload(defaultLayoutId, Layout(currentPageId = "cards"))
-
-	controller.objectStore.preload(
-		"cards", Page(
-			title = "Products",
-			type = PageType.Plain("ShoppingBasket"),
-			subtitle = "Hello darkness my old friend, I've come to talk with you again",
-			view = CardView(
-				options = CardViewOptions(excessiveRounding = true, useCardPadding = true),
-				mutableListOf(
-					CardContainer.SingularCardContainer("Hammer_Product"),
-					CardContainer.SingularCardContainer("Hammer_Product"),
-					CardContainer.SingularCardContainer("Hammer_Product"),
-				)
-			)
-		)
-
-	)
-
-	controller.objectStore.preload(
-		"Hammer_Product", Page(
-			title = "Premium Hammer", subtitle = "Hammers Inc.", type = PageType.Post(
-				supertitle = "PRODUCT", imageUrls = mutableListOf(
-					"https://s3-alpha-sig.figma.com/img/c791/197e/dcf10efc9fa151a9e05a3cdb5135450e?Expires=1729468800&Key-Pair-Id=APKAQ4GOSFWCVNEHN3O4&Signature=kztBpUK9GdKSU0bOVEMBlxjzUMbLAcJfGVOqOjvMdvfoLL2d0OsiVej-PUy3yoFxqVSs5L7cShG6wUL7WTQ7DlvI98fcBBPfh5Fz0Ly5Z~4LMywr-nPPV1fIhlnWkwV8ZVhUYDS-4ktZjS1AWVNj0YfnrX4SRXVB4lCgl0uIX93E8zCOkk2tsNBbNtKp2mAZX1Wd7jprwPELnp1cuX-B3lm23BRYxGsq99yI6Ez0UVXEJRoto-f3w0YoWqMSfHTZxGwxaCv8oGhWSb5bR~J4JQL19kERthz38TbtzpUG9DAwW3Mou5swhPbdgi1O7yBJdlAUqN9uv3SEEQPYNzGBGQ__"
-				), additionalInfo = "$55"
-			)
-
-		)
-	)
-
-	TestProvider(controller)
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/objectionapp/Constants.kt b/app/src/main/java/com/example/objectionapp/Constants.kt
index 9952093..337cb62 100644
--- a/app/src/main/java/com/example/objectionapp/Constants.kt
+++ b/app/src/main/java/com/example/objectionapp/Constants.kt
@@ -12,6 +12,8 @@ val lightBackgroundColor = Color(red = 240, green = 240, blue = 255)
 val darkBackgroundColor = Color(red = 12, green = 12, blue = 20)
 val lightForegroundColor = Color(red = 12, green = 12, blue = 20)
 val darkForegroundColor = Color(red = 240, green = 240, blue = 255)
+val lightLoaderColor = Color(red = 240, green = 40, blue = 40)
+val darkLoaderColor = Color(red = 240, green = 40, blue = 40)
 
 val defaultThemeId = "theme_default"
 val defaultLayoutId = "layout_default"
diff --git a/app/src/main/java/com/example/objectionapp/ContentView.kt b/app/src/main/java/com/example/objectionapp/ContentView.kt
deleted file mode 100644
index da6a696..0000000
--- a/app/src/main/java/com/example/objectionapp/ContentView.kt
+++ /dev/null
@@ -1,491 +0,0 @@
-package com.example.objectionapp
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.LazyRow
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Button
-import androidx.compose.material3.ButtonColors
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardColors
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.LocalContentColor
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import coil.compose.AsyncImage
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonClassDiscriminator
-
-@OptIn(ExperimentalSerializationApi::class)
-@Serializable
-@JsonClassDiscriminator("$")
-@ContentKey("def")
-sealed class Style {
-	@Serializable
-	@SerialName("Padding")
-	data class PaddingHorizontal(val def: Float) : Style()
-
-	@Serializable
-	@SerialName("PaddingVertical")
-	data class PaddingVertical(val def: Float) : Style()
-
-	@Serializable
-	@SerialName("PaddingTop")
-	data class PaddingTop(val def: Float) : Style()
-
-	@Serializable
-	@SerialName("PaddingBottom")
-	data class PaddingBottom(val def: Float) : Style()
-
-	@Serializable
-	@SerialName("PaddingStart")
-	data class PaddingStart(val def: Float) : Style()
-
-	@Serializable
-	@SerialName("PaddingEnd")
-	data class PaddingEnd(val def: Float) : Style()
-
-	@Serializable
-	@SerialName("ClipCornerRadius")
-	data class ClipCornerRadius(val def: Float) : Style()
-
-	@Serializable
-	@SerialName("Width")
-	data class Width(val def: Float) : Style()
-
-	@Serializable
-	@SerialName("Height")
-	data class Height(val def: Float) : Style()
-
-	@Serializable
-	@SerialName("Size")
-	data class Size(val def: Float) : Style()
-
-	@Serializable
-	@SerialName("FillMaxWidth")
-	data object FillMaxWidth : Style()
-
-	@Serializable
-	@SerialName("FillMaxHeight")
-	data object FillMaxHeight : Style()
-
-	@Serializable
-	@SerialName("FillMaxSize")
-	data object FillMaxSize : Style()
-
-	fun apply(modifier: Modifier): Modifier {
-		return when (this) {
-			is PaddingHorizontal -> modifier.padding(horizontal = def.dp)
-			is PaddingVertical -> modifier.padding(vertical = def.dp)
-			is PaddingTop -> modifier.padding(top = def.dp)
-			is PaddingBottom -> modifier.padding(bottom = def.dp)
-			is PaddingStart -> modifier.padding(start = def.dp)
-			is PaddingEnd -> modifier.padding(end = def.dp)
-			is ClipCornerRadius -> modifier.clip(RoundedCornerShape(def.dp))
-			is Width -> modifier.width(def.dp)
-			is Height -> modifier.height(def.dp)
-			is Size -> modifier.size(def.dp)
-			is FillMaxWidth -> modifier.fillMaxWidth()
-			is FillMaxHeight -> modifier.fillMaxHeight()
-			is FillMaxSize -> modifier.fillMaxSize()
-		}
-	}
-}
-
-fun compileStyles(styles: List<Style>, initialModifier: Modifier = Modifier): Modifier {
-	var modifier = initialModifier
-
-	for (style in styles) {
-		modifier = style.apply(modifier)
-	}
-
-	return modifier
-}
-
-@OptIn(ExperimentalSerializationApi::class)
-@Serializable
-@JsonClassDiscriminator("$")
-sealed class ThemeColor {
-	@Serializable
-	@SerialName("Primary")
-	data object Primary : ThemeColor()
-
-	@Serializable
-	@SerialName("Secondary")
-	data object Secondary : ThemeColor()
-
-	@Serializable
-	@SerialName("Tertiary")
-	data object Tertiary : ThemeColor()
-
-	@Serializable
-	@SerialName("Surface")
-	data object Surface : ThemeColor()
-
-	@Serializable
-	@SerialName("Inverse")
-	data object Inverse : ThemeColor()
-
-	@Composable
-	fun getContainerColor(): Color {
-		return when (this) {
-			is Primary -> MaterialTheme.colorScheme.primary
-			is Secondary -> MaterialTheme.colorScheme.secondary
-			is Tertiary -> MaterialTheme.colorScheme.tertiary
-			is Surface -> MaterialTheme.colorScheme.surface
-			is Inverse -> MaterialTheme.colorScheme.inverseSurface
-		}
-	}
-
-	@Composable
-	fun getContentColor(): Color {
-		return when (this) {
-			is Primary -> MaterialTheme.colorScheme.onPrimary
-			is Secondary -> MaterialTheme.colorScheme.onSecondary
-			is Tertiary -> MaterialTheme.colorScheme.onTertiary
-			is Surface -> MaterialTheme.colorScheme.onSurface
-			is Inverse -> MaterialTheme.colorScheme.inverseOnSurface
-		}
-	}
-}
-
-@OptIn(ExperimentalSerializationApi::class)
-@JsonClassDiscriminator("$")
-@Serializable
-sealed class ContentView : View() {
-	@Serializable
-	@SerialName("Column")
-	data class Column(
-		val styles: List<Style> = listOf(), val spacing: Int = 0, val items: List<Item> = listOf()
-	) : ContentView() {
-		@Serializable
-		data class Item(
-			val expand: Boolean = false,
-			val content: ContentView,
-		)
-	}
-
-	@Serializable
-	@SerialName("ScrollingColumn")
-	data class ScrollingColumn(
-		val styles: List<Style> = listOf(),
-		val spacing: Int = 0,
-		val items: List<ContentView> = listOf()
-	) : ContentView()
-
-	@Serializable
-	@SerialName("Row")
-	data class Row(
-		val styles: List<Style> = listOf(), val spacing: Int = 10, val items: List<Item> = listOf()
-	) : ContentView() {
-		@Serializable
-		data class Item(val expand: Boolean = false, val content: ContentView)
-	}
-
-	@Serializable
-	@SerialName("ScrollingRow")
-	data class ScrollingRow(
-		val styles: List<Style> = listOf(),
-		val spacing: Int = 0,
-		val items: List<ContentView> = listOf()
-	) : ContentView()
-
-	@Serializable
-	@SerialName("Box")
-	data class Box(
-		val color: ThemeColor? = null,
-		val styles: List<Style> = listOf(),
-		val items: List<ContentView> = listOf()
-	) : ContentView()
-
-	@Serializable
-	@SerialName("Button")
-	data class Button(
-		val link: Link,
-		val styles: List<Style> = listOf(),
-		val color: ThemeColor,
-		val content: ContentView,
-	) : ContentView()
-
-	@Serializable
-	@SerialName("Paragraph")
-	data class Text(
-		val text: String,
-		val size: Int? = null,
-		val weight: Weight? = null,
-	) : ContentView() {
-		@Serializable
-		@JsonClassDiscriminator("$")
-		sealed class Weight {
-			@Serializable
-			@SerialName("Light")
-			data object Light : Weight()
-
-			@Serializable
-			@SerialName("Normal")
-			data object Normal : Weight()
-
-			@Serializable
-			@SerialName("SemiBold")
-			data object SemiBold : Weight()
-
-			@Serializable
-			@SerialName("Bold")
-			data object Bold : Weight()
-
-			fun toWeight(): FontWeight {
-				return when (this) {
-					is Light -> FontWeight.Light
-					is Normal -> FontWeight.Normal
-					is SemiBold -> FontWeight.SemiBold
-					is Bold -> FontWeight.Bold
-				}
-			}
-		}
-	}
-
-	@Serializable
-	@SerialName("Center")
-	data class Center(
-		val styles: List<Style>, val content: ContentView
-	) : ContentView()
-
-	@Serializable
-	@SerialName("Card")
-	data class Card(
-		val styles: List<Style>,
-		val link: Link? = null,
-		val color: ThemeColor,
-		val content: ContentView,
-	) : ContentView()
-
-	@Serializable
-	@SerialName("Image")
-	data class Image(
-		val styles: List<Style> = listOf(), val url: String, val description: String
-	) : ContentView()
-}
-
-@Composable
-fun ContentViewRender(view: ContentView, scrollConnection: NestedScrollConnection?) {
-	when (view) {
-		is ContentView.Row -> {
-			Row(
-				modifier = compileStyles(view.styles),
-				horizontalArrangement = Arrangement.spacedBy(view.spacing.dp),
-			) {
-				for (child in view.items) {
-					Box(if (child.expand) Modifier.weight(1F) else Modifier) {
-						ContentViewRender(child.content, scrollConnection)
-					}
-				}
-			}
-		}
-
-		is ContentView.ScrollingRow -> {
-			LazyRow(
-				modifier = compileStyles(view.styles),
-				horizontalArrangement = Arrangement.spacedBy(view.spacing.dp),
-			) {
-				for (child in view.items) {
-					item {
-						ContentViewRender(child, scrollConnection)
-					}
-				}
-			}
-		}
-
-		is ContentView.Column -> {
-			Column(
-				verticalArrangement = Arrangement.spacedBy(view.spacing.dp),
-				modifier = compileStyles(view.styles)
-			) {
-				for (item in view.items) {
-					Box(if (item.expand) Modifier.weight(1F) else Modifier) {
-						ContentViewRender(item.content, scrollConnection)
-					}
-				}
-			}
-		}
-
-		is ContentView.ScrollingColumn -> {
-			LazyColumn(verticalArrangement = Arrangement.spacedBy(view.spacing.dp),
-				modifier = compileStyles(view.styles,
-					initialModifier = scrollConnection?.let { Modifier.nestedScroll(it) }
-						?: Modifier)) {
-				for (child in view.items) {
-					item {
-						ContentViewRender(child, null)
-					}
-				}
-			}
-		}
-
-		is ContentView.Box -> {
-			val modifier =
-				if (view.color != null) Modifier.background(view.color.getContentColor()) else Modifier
-
-			Box(modifier = compileStyles(view.styles, modifier)) {
-				if (view.color != null) {
-					CompositionLocalProvider(LocalContentColor provides view.color.getContentColor()) {
-						for (child in view.items) {
-							ContentViewRender(child, scrollConnection)
-						}
-					}
-				} else {
-					for (child in view.items) {
-						ContentViewRender(child, scrollConnection)
-					}
-				}
-			}
-		}
-
-		is ContentView.Button -> {
-			val navController = useNavController()
-
-			Button(modifier = compileStyles(view.styles),
-				onClick = { view.link.follow(navController) },
-				colors = ButtonColors(
-					contentColor = view.color.getContentColor(),
-					containerColor = view.color.getContainerColor(),
-					disabledContentColor = view.color.getContentColor(),
-					disabledContainerColor = view.color.getContainerColor()
-				),
-				content = {
-					ContentViewRender(view.content, scrollConnection)
-				})
-		}
-
-		is ContentView.Text -> {
-			Text(
-				view.text,
-				color = LocalContentColor.current,
-				fontWeight = (view.weight ?: ContentView.Text.Weight.Normal).toWeight(),
-				fontSize = (view.size ?: 16).sp
-			)
-		}
-
-		is ContentView.Center -> {
-			Row(
-				Modifier.fillMaxSize(),
-				horizontalArrangement = Arrangement.Center,
-				verticalAlignment = Alignment.CenterVertically
-			) {
-				ContentViewRender(view.content, scrollConnection)
-			}
-		}
-
-		is ContentView.Card -> {
-			val navController = useNavController()
-
-			Card(
-				modifier = compileStyles(view.styles),
-				elevation = CardDefaults.elevatedCardElevation(defaultElevation = 5.dp),
-				colors = CardColors(
-					containerColor = view.color.getContainerColor(),
-					contentColor = view.color.getContentColor(),
-					disabledContentColor = view.color.getContentColor(),
-					disabledContainerColor = view.color.getContainerColor()
-				),
-				onClick = {
-					if (view.link != null) view.link.follow(navController)
-				},
-			) {
-				ContentViewRender(view.content, scrollConnection)
-			}
-		}
-
-		is ContentView.Image -> {
-			AsyncImage(
-				view.url,
-				contentDescription = view.description,
-				modifier = compileStyles(view.styles)
-			)
-		}
-	}
-}
-
-@Preview
-@Composable
-fun ContentPreview() {
-	val controller = Controller.fromConstants()
-
-	controller.objectStore.preload(defaultThemeId, Theme())
-	controller.objectStore.preload(defaultLayoutId, Layout(currentPageId = "page"))
-
-	controller.objectStore.preload(
-		"page", Page(
-			title = "Hello There", type = PageType.Plain(), view = ContentView.ScrollingColumn(
-				spacing = 2, items = listOf(
-//					ContentView.Text(text = "Hello world!"), ContentView.Center(
-//						ContentView.Button(
-//							text = "Click me", icon = "Search", link = Link(pageId = "link")
-//						)
-//					), ContentView.Center(
-//						ContentView.Button(
-//							text = "Prime me",
-//							icon = "Search",
-//							primary = true,
-//							large = true,
-//							link = Link(pageId = "link", useSheet = true)
-//						)
-//					), ContentView.Row(
-//						items = listOf(
-//							ContentView.Center(ContentView.Paragraph("Hello there")),
-//							ContentView.Center(ContentView.Paragraph("inner"))
-//						)
-//					), ContentView.Row(
-//						items = listOf(
-//							ContentView.Button(
-//								text = "Foo", link = Link(pageId = "link"), stretch = true
-//							),
-//							ContentView.Button(
-//								text = "Bar", link = Link(pageId = "link"), stretch = true
-//							),
-//						)
-//					), ContentView.CustomCard(
-//						isPrimary = true,
-//						title = "This is a title",
-//						subtitle = "Foo * Bar * Bin * Baz",
-//						imageUrl = "https://picsum.photos/400",
-//						footerIcon = "Lightbulb",
-//						footerText = "Hello there",
-//						options = CardViewOptions(useCardPadding = true, excessiveRounding = true),
-//						spacer = 30
-//					)
-				)
-			)
-		)
-	)
-
-	controller.objectStore.preload(
-		"link", Page(title = "Link", type = PageType.Plain())
-	)
-
-	TestProvider(controller)
-}
diff --git a/app/src/main/java/com/example/objectionapp/Controller.kt b/app/src/main/java/com/example/objectionapp/Controller.kt
index 42822e3..e322c46 100644
--- a/app/src/main/java/com/example/objectionapp/Controller.kt
+++ b/app/src/main/java/com/example/objectionapp/Controller.kt
@@ -13,7 +13,9 @@ class Controller(
     val lightBackgroundColor: Color,
     val darkBackgroundColor: Color,
     val lightForegroundColor: Color,
-    val darkForegroundColor: Color
+    val darkForegroundColor: Color,
+    val lightLoaderColor: Color,
+    val darkLoaderColor: Color,
 ) {
     val session = Session()
     val logger = Logger(session, scope = appName)
@@ -32,6 +34,8 @@ class Controller(
                 darkBackgroundColor = darkBackgroundColor,
                 lightForegroundColor = lightForegroundColor,
                 darkForegroundColor = darkForegroundColor,
+                lightLoaderColor = lightLoaderColor,
+                darkLoaderColor = darkLoaderColor,
             )
         }
     }
diff --git a/app/src/main/java/com/example/objectionapp/FormView.kt b/app/src/main/java/com/example/objectionapp/FormView.kt
index 75b4a2d..f3aa518 100644
--- a/app/src/main/java/com/example/objectionapp/FormView.kt
+++ b/app/src/main/java/com/example/objectionapp/FormView.kt
@@ -1,258 +1,258 @@
-package com.example.objectionapp
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.wrapContentHeight
-import androidx.compose.foundation.layout.wrapContentWidth
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.text.KeyboardActions
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material3.ButtonColors
-import androidx.compose.material3.ElevatedButton
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedButton
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Switch
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarScrollBehavior
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalFocusManager
-import androidx.compose.ui.text.input.PasswordVisualTransformation
-import androidx.compose.ui.text.input.VisualTransformation
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.encodeToJsonElement
-
-@Composable
-@OptIn(ExperimentalMaterial3Api::class)
-fun FormViewRender(view: View.FormView, scrollBehavior: TopAppBarScrollBehavior) {
-
-
-	val controller = useController()
-	Column(
-		modifier = Modifier
-			.fillMaxHeight()
-			.padding(20.dp),
-		verticalArrangement = if (view.actionStyle is FormActionStyle.Relative) Arrangement.spacedBy(
-			10.dp
-		) else if (view.actionStyle is FormActionStyle.BottomFixed) Arrangement.SpaceBetween else Arrangement.Top
-
-
-	) {
-		LazyColumn(
-			Modifier
-				.fillMaxWidth()
-				.nestedScroll(scrollBehavior.nestedScrollConnection),
-			verticalArrangement = Arrangement.spacedBy(8.dp)
-		) {
-			view.items.map {
-				item {
-					FormItemRender(it)
-				}
-			}
-		}
-		Box {
-			if (view.actionStyle is FormActionStyle.Relative || view.actionStyle is FormActionStyle.BottomFixed) actionLayout(
-				view
-			)
-		}
-	}
-}
-
-@Composable
-fun actionLayout(view: View.FormView) {
-
-	val buttonSize = if (view.actionStyle !is FormActionStyle.TopBar) Modifier.fillMaxWidth()
-	else Modifier.wrapContentWidth()
-
-	val weight = if (view.actionStyle !is FormActionStyle.TopBar) 1f else null
-
-	Row(
-		modifier = buttonSize, horizontalArrangement = Arrangement.spacedBy(20.dp)
-	) {
-		view.actions.secondaryAction?.let {
-			Box(modifier = weight?.let { Modifier.weight(it) } ?: Modifier) {
-				OutlinedButton(modifier = buttonSize, onClick = {
-					println("clicked")
-				}) {
-					Text(it.title)
-				}
-			}
-		}
-
-		view.actions.primaryAction.let {
-
-			Box(modifier = weight?.let { Modifier.weight(it) } ?: Modifier) {
-				ElevatedButton(modifier = buttonSize, colors = ButtonColors(
-					containerColor = MaterialTheme.colorScheme.primary,
-					contentColor = MaterialTheme.colorScheme.onPrimary,
-					disabledContainerColor = MaterialTheme.colorScheme.primaryContainer,
-					disabledContentColor = MaterialTheme.colorScheme.onPrimaryContainer
-				), onClick = {
-					println("clicked")
-				})
-
-				{
-					Text(it.title)
-				}
-			}
-		}
-
-	}
-}
-
-
-@Composable
-fun FormItemRender(item: FormItem) {
-	when (item.input) {
-		is Input.Text -> TextFieldRender(item = item, input = item.input, mode = item.input.mode)
-		is Input.Switch -> SwitchRender(item = item, input = item.input)
-	}
-}
-
-@Composable
-fun SwitchRender(item: FormItem, input: Input.Switch) {
-	val controller = useController()
-	var checked by remember { mutableStateOf(input.switched.child) }
-
-	Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
-		Column {
-			item.label?.let { Text(it, fontSize = MaterialTheme.typography.bodyLarge.fontSize) }
-			item.description?.let {
-				Text(
-					it, fontSize = MaterialTheme.typography.labelSmall.fontSize
-				)
-			}
-		}
-
-		Switch(checked = checked, onCheckedChange = {
-			checked = it
-			controller.bridge.emitBindingUpdate(input.switched.key, Json.encodeToJsonElement(it)) {}
-		})
-	}
-}
-
-@Composable
-fun TextFieldRender(
-	item: FormItem, input: Input.Text, mode: InputMode
-) {
-	val controller = useController()
-	var text by remember { mutableStateOf(input.startingValue.child) }
-	var hiddenState by remember { mutableStateOf(true) }
-
-	val multiline = if (mode is InputMode.Text) mode.multiline
-	else false
-	val trailingIcon = if (mode is InputMode.Text) mode.trailingIcon else null
-	val password = mode is InputMode.Password
-
-	val description = item.description
-	val status = input.fieldStatus
-	val label = item.label
-	val placeholder = input.placeholder
-	val readOnly = input.readOnly
-
-	val focusManager = LocalFocusManager.current
-
-
-	OutlinedTextField(singleLine = !multiline,
-		readOnly = readOnly,
-		supportingText = { description?.let { Text(it) } },
-		isError = status == TextFieldStatus.Error,
-		enabled = status != TextFieldStatus.Disabled,
-		value = text,
-		placeholder = { placeholder?.let { Text(it) } },
-		keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }),
-		onValueChange = {
-			text = it
-			controller.bridge.emitBindingUpdate(
-				input.startingValue.key, Json.encodeToJsonElement(it)
-			) {}
-		},
-		visualTransformation = if (password && hiddenState) PasswordVisualTransformation() else VisualTransformation.None,
-		label = { label?.let { Text(it) } },
-		modifier = Modifier.fillMaxWidth(),
-		keyboardOptions = KeyboardOptions(
-			keyboardType = mode.getKeyboardType()
-		),
-		trailingIcon = {
-			if (password) {
-				IconButton(modifier = Modifier.wrapContentHeight(), onClick = {
-					hiddenState = !hiddenState
-				}) {
-					if (hiddenState) StandardIcon("VisibilityOff")
-					else (StandardIcon("Visibility"))
-				}
-			}
-
-			trailingIcon?.let { StandardIcon(it) }
-		})
-}
-
-@Preview
-@Composable
-fun FormViewTest() {
-	val controller = Controller.fromConstants()
-
-	controller.objectStore.preload("theme_default", Theme())
-	controller.objectStore.preload("layout_default", Layout(currentPageId = "Products"))
-
-	controller.objectStore.preload(
-		"Products", Page(
-			title = "Products",
-			type = PageType.Plain("ShoppingBasket"),
-			subtitle = "Hello darkness my old friend, I've come to talk with you again",
-			view = View.FormView(
-				items = listOf(
-					FormItem(
-						submitStrategy = SubmitStrategy.OnSubmit,
-						label = "Text Input",
-						description = "some supporting text",
-						input = Input.Text(
-							startingValue = Binding("start", ""),
-							placeholder = "not a little note",
-							mode = InputMode.Text(trailingIcon = "Bolt"),
-						)
-					),
-					FormItem(
-						submitStrategy = SubmitStrategy.OnSubmit,
-						label = "Password Input",
-						description = "Your password is too gay. Try again.",
-						input = Input.Text(
-							fieldStatus = TextFieldStatus.Error,
-							startingValue = Binding("start", ""),
-							placeholder = "not a little note",
-							mode = InputMode.Password,
-						)
-					),
-					FormItem(
-						submitStrategy = SubmitStrategy.OnSubmit,
-						label = "Switch Input",
-						description = "A quick description of what is getting switched.",
-						input = Input.Switch(switched = Binding("key", true))
-					),
-				), actionStyle = FormActionStyle.TopBar, actions = FormActions(
-					primaryAction = FormAction(
-						title = "Login", link = Link("Products")
-					), secondaryAction = FormAction(
-						title = "Sign up", link = Link("Products")
-					)
-				)
-			)
-		)
-	)
-	TestProvider(controller)
-}
\ No newline at end of file
+//package com.example.objectionapp
+//
+//import androidx.compose.foundation.layout.Arrangement
+//import androidx.compose.foundation.layout.Box
+//import androidx.compose.foundation.layout.Column
+//import androidx.compose.foundation.layout.Row
+//import androidx.compose.foundation.layout.fillMaxHeight
+//import androidx.compose.foundation.layout.fillMaxWidth
+//import androidx.compose.foundation.layout.padding
+//import androidx.compose.foundation.layout.wrapContentHeight
+//import androidx.compose.foundation.layout.wrapContentWidth
+//import androidx.compose.foundation.lazy.LazyColumn
+//import androidx.compose.foundation.text.KeyboardActions
+//import androidx.compose.foundation.text.KeyboardOptions
+//import androidx.compose.material3.ButtonColors
+//import androidx.compose.material3.ElevatedButton
+//import androidx.compose.material3.ExperimentalMaterial3Api
+//import androidx.compose.material3.IconButton
+//import androidx.compose.material3.MaterialTheme
+//import androidx.compose.material3.OutlinedButton
+//import androidx.compose.material3.OutlinedTextField
+//import androidx.compose.material3.Switch
+//import androidx.compose.material3.Text
+//import androidx.compose.material3.TopAppBarScrollBehavior
+//import androidx.compose.runtime.Composable
+//import androidx.compose.runtime.getValue
+//import androidx.compose.runtime.mutableStateOf
+//import androidx.compose.runtime.remember
+//import androidx.compose.runtime.setValue
+//import androidx.compose.ui.Modifier
+//import androidx.compose.ui.input.nestedscroll.nestedScroll
+//import androidx.compose.ui.platform.LocalFocusManager
+//import androidx.compose.ui.text.input.PasswordVisualTransformation
+//import androidx.compose.ui.text.input.VisualTransformation
+//import androidx.compose.ui.tooling.preview.Preview
+//import androidx.compose.ui.unit.dp
+//import kotlinx.serialization.json.Json
+//import kotlinx.serialization.json.encodeToJsonElement
+//
+//@Composable
+//@OptIn(ExperimentalMaterial3Api::class)
+//fun FormViewRender(view: View.FormView, scrollBehavior: TopAppBarScrollBehavior) {
+//
+//
+//	val controller = useController()
+//	Column(
+//		modifier = Modifier
+//			.fillMaxHeight()
+//			.padding(20.dp),
+//		verticalArrangement = if (view.actionStyle is FormActionStyle.Relative) Arrangement.spacedBy(
+//			10.dp
+//		) else if (view.actionStyle is FormActionStyle.BottomFixed) Arrangement.SpaceBetween else Arrangement.Top
+//
+//
+//	) {
+//		LazyColumn(
+//			Modifier
+//				.fillMaxWidth()
+//				.nestedScroll(scrollBehavior.nestedScrollConnection),
+//			verticalArrangement = Arrangement.spacedBy(8.dp)
+//		) {
+//			view.items.map {
+//				item {
+//					FormItemRender(it)
+//				}
+//			}
+//		}
+//		Box {
+//			if (view.actionStyle is FormActionStyle.Relative || view.actionStyle is FormActionStyle.BottomFixed) actionLayout(
+//				view
+//			)
+//		}
+//	}
+//}
+//
+//@Composable
+//fun actionLayout(view: View.FormView) {
+//
+//	val buttonSize = if (view.actionStyle !is FormActionStyle.TopBar) Modifier.fillMaxWidth()
+//	else Modifier.wrapContentWidth()
+//
+//	val weight = if (view.actionStyle !is FormActionStyle.TopBar) 1f else null
+//
+//	Row(
+//		modifier = buttonSize, horizontalArrangement = Arrangement.spacedBy(20.dp)
+//	) {
+//		view.actions.secondaryAction?.let {
+//			Box(modifier = weight?.let { Modifier.weight(it) } ?: Modifier) {
+//				OutlinedButton(modifier = buttonSize, onClick = {
+//					println("clicked")
+//				}) {
+//					Text(it.title)
+//				}
+//			}
+//		}
+//
+//		view.actions.primaryAction.let {
+//
+//			Box(modifier = weight?.let { Modifier.weight(it) } ?: Modifier) {
+//				ElevatedButton(modifier = buttonSize, colors = ButtonColors(
+//					containerColor = MaterialTheme.colorScheme.primary,
+//					contentColor = MaterialTheme.colorScheme.onPrimary,
+//					disabledContainerColor = MaterialTheme.colorScheme.primaryContainer,
+//					disabledContentColor = MaterialTheme.colorScheme.onPrimaryContainer
+//				), onClick = {
+//					println("clicked")
+//				})
+//
+//				{
+//					Text(it.title)
+//				}
+//			}
+//		}
+//
+//	}
+//}
+//
+//
+//@Composable
+//fun FormItemRender(item: FormItem) {
+//	when (item.input) {
+//		is Input.Text -> TextFieldRender(item = item, input = item.input, mode = item.input.mode)
+//		is Input.Switch -> SwitchRender(item = item, input = item.input)
+//	}
+//}
+//
+//@Composable
+//fun SwitchRender(item: FormItem, input: Input.Switch) {
+//	val controller = useController()
+//	var checked by remember { mutableStateOf(input.switched.child) }
+//
+//	Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
+//		Column {
+//			item.label?.let { Text(it, fontSize = MaterialTheme.typography.bodyLarge.fontSize) }
+//			item.description?.let {
+//				Text(
+//					it, fontSize = MaterialTheme.typography.labelSmall.fontSize
+//				)
+//			}
+//		}
+//
+//		Switch(checked = checked, onCheckedChange = {
+//			checked = it
+//			controller.bridge.emitBindingUpdate(input.switched.key, Json.encodeToJsonElement(it)) {}
+//		})
+//	}
+//}
+//
+//@Composable
+//fun TextFieldRender(
+//	item: FormItem, input: Input.Text, mode: InputMode
+//) {
+//	val controller = useController()
+//	var text by remember { mutableStateOf(input.startingValue.child) }
+//	var hiddenState by remember { mutableStateOf(true) }
+//
+//	val multiline = if (mode is InputMode.Text) mode.multiline
+//	else false
+//	val trailingIcon = if (mode is InputMode.Text) mode.trailingIcon else null
+//	val password = mode is InputMode.Password
+//
+//	val description = item.description
+//	val status = input.fieldStatus
+//	val label = item.label
+//	val placeholder = input.placeholder
+//	val readOnly = input.readOnly
+//
+//	val focusManager = LocalFocusManager.current
+//
+//
+//	OutlinedTextField(singleLine = !multiline,
+//		readOnly = readOnly,
+//		supportingText = { description?.let { Text(it) } },
+//		isError = status == TextFieldStatus.Error,
+//		enabled = status != TextFieldStatus.Disabled,
+//		value = text,
+//		placeholder = { placeholder?.let { Text(it) } },
+//		keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }),
+//		onValueChange = {
+//			text = it
+//			controller.bridge.emitBindingUpdate(
+//				input.startingValue.key, Json.encodeToJsonElement(it)
+//			) {}
+//		},
+//		visualTransformation = if (password && hiddenState) PasswordVisualTransformation() else VisualTransformation.None,
+//		label = { label?.let { Text(it) } },
+//		modifier = Modifier.fillMaxWidth(),
+//		keyboardOptions = KeyboardOptions(
+//			keyboardType = mode.getKeyboardType()
+//		),
+//		trailingIcon = {
+//			if (password) {
+//				IconButton(modifier = Modifier.wrapContentHeight(), onClick = {
+//					hiddenState = !hiddenState
+//				}) {
+//					if (hiddenState) StandardIcon("VisibilityOff")
+//					else (StandardIcon("Visibility"))
+//				}
+//			}
+//
+//			trailingIcon?.let { StandardIcon(it) }
+//		})
+//}
+//
+//@Preview
+//@Composable
+//fun FormViewTest() {
+//	val controller = Controller.fromConstants()
+//
+//	controller.objectStore.preload("theme_default", Theme())
+//	controller.objectStore.preload("layout_default", Layout(currentPageId = "Products"))
+//
+//	controller.objectStore.preload(
+//		"Products", Page(
+//			title = "Products",
+//			type = PageType.Plain("ShoppingBasket"),
+//			subtitle = "Hello darkness my old friend, I've come to talk with you again",
+//			view = View.FormView(
+//				items = listOf(
+//					FormItem(
+//						submitStrategy = SubmitStrategy.OnSubmit,
+//						label = "Text Input",
+//						description = "some supporting text",
+//						input = Input.Text(
+//							startingValue = Binding("start", ""),
+//							placeholder = "not a little note",
+//							mode = InputMode.Text(trailingIcon = "Bolt"),
+//						)
+//					),
+//					FormItem(
+//						submitStrategy = SubmitStrategy.OnSubmit,
+//						label = "Password Input",
+//						description = "Your password is too gay. Try again.",
+//						input = Input.Text(
+//							fieldStatus = TextFieldStatus.Error,
+//							startingValue = Binding("start", ""),
+//							placeholder = "not a little note",
+//							mode = InputMode.Password,
+//						)
+//					),
+//					FormItem(
+//						submitStrategy = SubmitStrategy.OnSubmit,
+//						label = "Switch Input",
+//						description = "A quick description of what is getting switched.",
+//						input = Input.Switch(switched = Binding("key", true))
+//					),
+//				), actionStyle = FormActionStyle.TopBar, actions = FormActions(
+//					primaryAction = FormAction(
+//						title = "Login", link = Link("Products")
+//					), secondaryAction = FormAction(
+//						title = "Sign up", link = Link("Products")
+//					)
+//				)
+//			)
+//		)
+//	)
+//	TestProvider(controller)
+//}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/objectionapp/GetSchema.kt b/app/src/main/java/com/example/objectionapp/GetSchema.kt
index 4ebefa1..8b3b049 100644
--- a/app/src/main/java/com/example/objectionapp/GetSchema.kt
+++ b/app/src/main/java/com/example/objectionapp/GetSchema.kt
@@ -14,8 +14,8 @@ fun main() {
         ignoreUnknownKeys = true
         isLenient = true
         encodeDefaults = true
-        prettyPrint = true
-        prettyPrintIndent = "\t"
+//        prettyPrint = true
+//        prettyPrintIndent = "\t"
     }
     val schema = SchemaBuilder().build(Object::class)
     val text = json.encodeToString(Schema.serializer(), schema)
diff --git a/app/src/main/java/com/example/objectionapp/Layout.kt b/app/src/main/java/com/example/objectionapp/Layout.kt
index d3d3365..a85a2b4 100644
--- a/app/src/main/java/com/example/objectionapp/Layout.kt
+++ b/app/src/main/java/com/example/objectionapp/Layout.kt
@@ -2,20 +2,32 @@ package com.example.objectionapp
 
 import androidx.compose.animation.ExperimentalSharedTransitionApi
 import androidx.compose.animation.SharedTransitionLayout
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.dialog
+import com.example.objectionapp.view.TabBar
+import com.example.objectionapp.view.TabBarRender
+import com.example.objectionapp.view.TextView
+import com.example.objectionapp.view.View
+import com.example.objectionapp.view.ViewRender
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
 @SerialName("Layout")
 data class Layout(
+	val topBar: View? = null,
+
 	@Description(
 		"The tab bar is shown at the bottom of the application. If there is no current page set, the current page will default to the first tab bar item."
 	) val tabBar: TabBar? = null,
@@ -23,12 +35,12 @@ data class Layout(
 	@Description("The page that is to be shown by default") @ObjectReference(Page::class) val currentPageId: String? = null,
 ) : Object() {
 	fun getRoots(): List<String> {
-		return (tabBar?.pages?.map { it } ?: listOf()) + (currentPageId?.let { listOf(it) }
+		return (tabBar?.buttons?.map { it.pageId } ?: listOf()) + (currentPageId?.let { listOf(it) }
 			?: listOf())
 	}
 
 	fun getInitialPageId(): String? {
-		return currentPageId ?: tabBar?.pages?.getOrNull(0)
+		return currentPageId ?: tabBar?.buttons?.getOrNull(0)?.pageId
 	}
 }
 
@@ -38,44 +50,56 @@ fun RenderDefaultLayout() {
 	val navController = useNavController()
 	val layout = useDefaultLayout()
 
-	Scaffold(bottomBar = { layout.tabBar?.let { TabBarRender(it) } }, content = { padding ->
-		val initialObjectId = layout.getInitialPageId()
-
-		if (initialObjectId != null) {
-			SharedTransitionLayout {
-				NavHost(
-					navController = navController,
-					startDestination = encodeObjectIdIntoPageRoute(initialObjectId)
-				) {
-					composable(getObjectIdPageRouteTemplate()) { navBackStackEntry ->
-						PageRender(
-							id = decodeObjectIdFromRouteArgs(navBackStackEntry.arguments),
-							bottomPadding = padding.calculateBottomPadding(),
-							animatedVisibilityScope = this,
-						)
-					}
-					dialog(getObjectIdDialogRouteTemplate()) { navBackStackEntry ->
-						PageRender(
-							id = decodeObjectIdFromRouteArgs(navBackStackEntry.arguments),
-							bottomPadding = padding.calculateBottomPadding(),
-							animatedVisibilityScope = null,
-						)
-					}
-					dialog(getObjectIdSheetRouteTemplate()) { navBackStackEntry ->
-						ModalBottomSheet(onDismissRequest = {
-							navController.popBackStack()
-						}) {
+	Scaffold(topBar = { layout.topBar?.let { ViewRender(it) } },
+		bottomBar = { layout.tabBar?.let { TabBarRender(it) } },
+		content = { padding ->
+			val initialObjectId = layout.getInitialPageId()
+			padding
+
+			if (initialObjectId != null) {
+				SharedTransitionLayout {
+					NavHost(
+						navController = navController,
+						startDestination = encodeObjectIdIntoPageRoute(initialObjectId)
+					) {
+						composable(getObjectIdPageRouteTemplate()) { navBackStackEntry ->
+							PageRender(
+								id = decodeObjectIdFromRouteArgs(navBackStackEntry.arguments!!),
+								scrollConnection = null
+//							bottomPadding = padding.calculateBottomPadding(),
+//							animatedVisibilityScope = this,
+							)
+						}
+						dialog(getObjectIdDialogRouteTemplate()) { navBackStackEntry ->
 							PageRender(
-								id = decodeObjectIdFromRouteArgs(navBackStackEntry.arguments),
-								bottomPadding = padding.calculateBottomPadding(),
-								animatedVisibilityScope = null,
+								id = decodeObjectIdFromRouteArgs(navBackStackEntry.arguments!!),
+								scrollConnection = null
+//							bottomPadding = padding.calculateBottomPadding(),
+//							animatedVisibilityScope = null,
 							)
 						}
+						dialog(getObjectIdSheetRouteTemplate()) { navBackStackEntry ->
+							ModalBottomSheet(
+								onDismissRequest = {
+									navController.popBackStack()
+								},
+								containerColor = MaterialTheme.colorScheme.background,
+								contentColor = MaterialTheme.colorScheme.onBackground,
+							) {
+								Box(Modifier.fillMaxSize()) {
+									PageRender(
+										id = decodeObjectIdFromRouteArgs(navBackStackEntry.arguments!!),
+										scrollConnection = null
+//								bottomPadding = padding.calculateBottomPadding(),
+//								animatedVisibilityScope = null,
+									)
+								}
+							}
+						}
 					}
 				}
 			}
-		}
-	})
+		})
 }
 
 @Composable
@@ -84,43 +108,39 @@ private fun SinglePageTest() {
 	val controller = Controller.fromConstants()
 	controller.objectStore.preload("theme_default", Theme())
 	controller.objectStore.preload("layout_default", Layout(currentPageId = "some_page"))
-	controller.objectStore.preload(
-		"some_page", Page(
-			title = "Some Page", type = PageType.Plain("settings")
-		)
-	)
+	controller.objectStore.preload("some_page", Page(view = TextView("Some Page")))
 
 	TestProvider(controller)
 }
 
-@Preview
-@Composable
-private fun TabViewTest() {
-	val controller = Controller.fromConstants()
-
-	controller.objectStore.preload("theme_default", Theme())
-	controller.objectStore.preload(
-		"layout_default", Layout(tabBar = TabBar(pages = listOf("darkness", "lightness")))
-	)
-
-	controller.objectStore.preload(
-		"darkness", Page(
-			title = "Darkness",
-			type = PageType.Plain("ShoppingBasket"),
-			subtitle = "Hello darkness my old friend, I've come to talk with you again"
-		)
-	)
-
-	controller.objectStore.preload(
-		"lightness", Page(
-			title = "Lightness",
-			type = PageType.Plain("Lightbulb"),
-			subtitle = "The light shines, and darkness cannot hide from it"
-		)
-	)
-
-	TestProvider(controller)
-}
+//@Preview
+//@Composable
+//private fun TabViewTest() {
+//	val controller = Controller.fromConstants()
+//
+//	controller.objectStore.preload("theme_default", Theme())
+//	controller.objectStore.preload(
+//		"layout_default", Layout(tabBar = TabBar(pages = listOf("darkness", "lightness")))
+//	)
+//
+//	controller.objectStore.preload(
+//		"darkness", Page(
+//			title = "Darkness",
+//			type = PageType.Plain("ShoppingBasket"),
+//			subtitle = "Hello darkness my old friend, I've come to talk with you again"
+//		)
+//	)
+//
+//	controller.objectStore.preload(
+//		"lightness", Page(
+//			title = "Lightness",
+//			type = PageType.Plain("Lightbulb"),
+//			subtitle = "The light shines, and darkness cannot hide from it"
+//		)
+//	)
+//
+//	TestProvider(controller)
+//}
 
 // TODO Fixme
 @Composable
@@ -130,7 +150,7 @@ fun EmptyLayoutTest() {
 	controller.objectStore.preload(
 		"theme_default", Theme(iconPack = IconPack.Rounded)
 	)
-	controller.objectStore.preload("layout_default", Layout(tabBar = TabBar(pages = listOf())))
+	controller.objectStore.preload("layout_default", Layout(tabBar = TabBar(buttons = listOf())))
 
 	TestProvider(controller)
 }
diff --git a/app/src/main/java/com/example/objectionapp/ListView.kt b/app/src/main/java/com/example/objectionapp/ListView.kt
index 356145b..ceb4306 100644
--- a/app/src/main/java/com/example/objectionapp/ListView.kt
+++ b/app/src/main/java/com/example/objectionapp/ListView.kt
@@ -1,97 +1,97 @@
-package com.example.objectionapp
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.ListItem
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarScrollBehavior
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.unit.dp
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class ListViewItem(
-	val pageId: String,
-)
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun ListView(
-	view: View.ListView,
-	scrollBehavior: TopAppBarScrollBehavior
-) {
-
-	LazyColumn(
-		Modifier
-			.nestedScroll(scrollBehavior.nestedScrollConnection)
-	) {
-		val allItems: List<ListViewItem> = view.items.flatten()
-
-		for ((index, item) in allItems.withIndex()) {
-			item {
-				val page = usePage(item.pageId) ?: return@item
-				val title = page.title ?: return@item
-				val subtitle = page.subtitle ?: return@item
-				val leadingIcon: String
-
-				if (page.type is PageType.Plain) leadingIcon = page.type.icon ?: "QuestionMark"
-				else return@item
-
-				ListViewRender(
-					title = page.title,
-					subtitle = page.subtitle,
-					leadingIcon,
-					trailingIcon = view.trailingIcon,
-				)
-				if (index <= (allItems.size - 2)) HorizontalDivider()
-			}
-		}
-	}
-}
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun ListViewRender(title: String, subtitle: String, leadingIcon: String?, trailingIcon: String?) {
-	val navController = useNavController()
-	ListItem(
-		headlineContent = { Text(title) },
-		supportingContent = { Text(subtitle) },
-		leadingContent = {
-			leadingIcon?.let {
-				Column(
-					modifier = Modifier
-						.fillMaxHeight()
-						.padding(5.dp),
-					verticalArrangement = Arrangement.SpaceAround,
-				) {
-					StandardIcon(it)
-				}
-			}
-		},
-		trailingContent = {
-			trailingIcon?.let {
-				Column(
-					modifier = Modifier
-						.fillMaxHeight()
-						.padding(5.dp),
-					verticalArrangement = Arrangement.SpaceAround,
-				) {
-					StandardIcon(it)
-				}
-			}
-		},
-		modifier = Modifier
-			.clickable {
-				navController.navigate(route = encodeObjectIdIntoPageRoute("Products"))
-			}
-			.fillMaxHeight()
-	)
-}
\ No newline at end of file
+//package com.example.objectionapp
+//
+//import androidx.compose.foundation.clickable
+//import androidx.compose.foundation.layout.Arrangement
+//import androidx.compose.foundation.layout.Column
+//import androidx.compose.foundation.layout.fillMaxHeight
+//import androidx.compose.foundation.layout.padding
+//import androidx.compose.foundation.lazy.LazyColumn
+//import androidx.compose.material3.ExperimentalMaterial3Api
+//import androidx.compose.material3.HorizontalDivider
+//import androidx.compose.material3.ListItem
+//import androidx.compose.material3.Text
+//import androidx.compose.material3.TopAppBarScrollBehavior
+//import androidx.compose.runtime.Composable
+//import androidx.compose.ui.Modifier
+//import androidx.compose.ui.input.nestedscroll.nestedScroll
+//import androidx.compose.ui.unit.dp
+//import kotlinx.serialization.Serializable
+//
+//@Serializable
+//data class ListViewItem(
+//	val pageId: String,
+//)
+//
+//@OptIn(ExperimentalMaterial3Api::class)
+//@Composable
+//fun ListView(
+//	view: View.ListView,
+//	scrollBehavior: TopAppBarScrollBehavior
+//) {
+//
+//	LazyColumn(
+//		Modifier
+//			.nestedScroll(scrollBehavior.nestedScrollConnection)
+//	) {
+//		val allItems: List<ListViewItem> = view.items.flatten()
+//
+//		for ((index, item) in allItems.withIndex()) {
+//			item {
+//				val page = usePage(item.pageId) ?: return@item
+//				val title = page.title ?: return@item
+//				val subtitle = page.subtitle ?: return@item
+//				val leadingIcon: String
+//
+//				if (page.type is PageType.Plain) leadingIcon = page.type.icon ?: "QuestionMark"
+//				else return@item
+//
+//				ListViewRender(
+//					title = page.title,
+//					subtitle = page.subtitle,
+//					leadingIcon,
+//					trailingIcon = view.trailingIcon,
+//				)
+//				if (index <= (allItems.size - 2)) HorizontalDivider()
+//			}
+//		}
+//	}
+//}
+//
+//@OptIn(ExperimentalMaterial3Api::class)
+//@Composable
+//fun ListViewRender(title: String, subtitle: String, leadingIcon: String?, trailingIcon: String?) {
+//	val navController = useNavController()
+//	ListItem(
+//		headlineContent = { Text(title) },
+//		supportingContent = { Text(subtitle) },
+//		leadingContent = {
+//			leadingIcon?.let {
+//				Column(
+//					modifier = Modifier
+//						.fillMaxHeight()
+//						.padding(5.dp),
+//					verticalArrangement = Arrangement.SpaceAround,
+//				) {
+//					StandardIcon(it)
+//				}
+//			}
+//		},
+//		trailingContent = {
+//			trailingIcon?.let {
+//				Column(
+//					modifier = Modifier
+//						.fillMaxHeight()
+//						.padding(5.dp),
+//					verticalArrangement = Arrangement.SpaceAround,
+//				) {
+//					StandardIcon(it)
+//				}
+//			}
+//		},
+//		modifier = Modifier
+//			.clickable {
+//				navController.navigate(route = encodeObjectIdIntoPageRoute("Products"))
+//			}
+//			.fillMaxHeight()
+//	)
+//}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/objectionapp/Navigation.kt b/app/src/main/java/com/example/objectionapp/Navigation.kt
new file mode 100644
index 0000000..77e397e
--- /dev/null
+++ b/app/src/main/java/com/example/objectionapp/Navigation.kt
@@ -0,0 +1,28 @@
+package com.example.objectionapp
+
+import androidx.compose.runtime.compositionLocalOf
+import androidx.navigation.NavController
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonClassDiscriminator
+
+var LinkShouldPopUp = compositionLocalOf<Boolean> { false }
+
+@OptIn(ExperimentalSerializationApi::class)
+@JsonClassDiscriminator("$")
+@Serializable
+data class Link(
+	@ObjectReference(Page::class) val pageId: String, val useSheet: Boolean? = null
+) {
+	fun follow(navController: NavController, popUp: Boolean) {
+		navController.navigate(
+			route = if (useSheet == true) encodeObjectIdIntoSheetRoute(pageId)
+			else encodeObjectIdIntoPageRoute(pageId)
+		) {
+			if (popUp) {
+				popUpTo(pageId)
+				launchSingleTop = true
+			}
+		}
+	}
+}
diff --git a/app/src/main/java/com/example/objectionapp/ObjectId.kt b/app/src/main/java/com/example/objectionapp/ObjectId.kt
index 3d5bab6..e6bff9b 100644
--- a/app/src/main/java/com/example/objectionapp/ObjectId.kt
+++ b/app/src/main/java/com/example/objectionapp/ObjectId.kt
@@ -38,8 +38,8 @@ fun encodeObjectIdIntoSheetRoute(objectId: String): String {
 }
 
 @OptIn(ExperimentalEncodingApi::class)
-fun decodeObjectIdFromRouteArgs(args: Bundle?): String {
-	val encodedId = args?.getString("encodedObjectId") ?: throw Exception("Invalid bundle")
+fun decodeObjectIdFromRouteArgs(args: Bundle): String {
+	val encodedId = args.getString("encodedObjectId") ?: throw Exception("Invalid bundle")
 
 	return String(bytes = Base64.UrlSafe.decode(encodedId))
 }
diff --git a/app/src/main/java/com/example/objectionapp/Page.kt b/app/src/main/java/com/example/objectionapp/Page.kt
index d7d1067..11b535f 100644
--- a/app/src/main/java/com/example/objectionapp/Page.kt
+++ b/app/src/main/java/com/example/objectionapp/Page.kt
@@ -20,12 +20,17 @@ import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
+import com.example.objectionapp.view.LocalScrollConnection
+import com.example.objectionapp.view.View
+import com.example.objectionapp.view.ViewRender
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -34,202 +39,213 @@ import kotlinx.serialization.json.JsonClassDiscriminator
 @Serializable
 @SerialName("Page")
 data class Page(
-	@Description("The page title will be displayed prominently at the top of the screen") val title: String? = null,
-	@Description("The page subtitle is displayed directly under any images on the page") val subtitle: String? = null,
-	@Description(
-		"The page that will be pulled up for a presumed search through the contents of this page"
-	) @ObjectReference(Page::class) val searchPageId: String? = null,
-
+//	@Description("The page title will be displayed prominently at the top of the screen") val title: String? = null,
+//	@Description("The page subtitle is displayed directly under any images on the page") val subtitle: String? = null,
+//	@Description(
+//		"The page that will be pulled up for a presumed search through the contents of this page"
+//	) @ObjectReference(Page::class) val searchPageId: String? = null,
 	val view: View? = null,
 
-	val type: PageType,
+//	val type: PageType,
 ) : Object()
 
-@OptIn(ExperimentalSerializationApi::class)
-@JsonClassDiscriminator("$")
-@Serializable
-sealed class PageType {
-	@Serializable
-	@SerialName("Post")
-	data class Post(
-		@Description("The images will be displayed in carousel form, directly below the title") val imageUrls: List<String>? = null,
-		@Description("The page supertitle is displayed directly below any images on the page") val supertitle: String? = null,
-		@Description("The additional info is displayed directly below any images on the page") val additionalInfo: String? = null,
-	) : PageType()
-
-	@Serializable
-	@SerialName("Profile")
-	data class Profile(
-		@Description("The the banner image for the user profile") val bannerImageUrl: String,
-		@Description("The avatar image for the user profile") val avatarImageUrl: String,
-	) : PageType()
-
-	@Serializable
-	@SerialName("Plain")
-	data class Plain(
-		val icon: String? = null
-	) : PageType()
-}
-
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalSharedTransitionApi::class)
 @Composable
-fun SharedTransitionScope.PageRender(
-	id: String,
-	bottomPadding: Dp,
-	animatedVisibilityScope: AnimatedVisibilityScope?,
-
-	) {
-	val page = usePage(id) ?: return
-	val navController = useNavController()
-	val layout = useDefaultLayout()
-	val isRoot = layout.getRoots().contains(id)
-
-
-	val scrollBehavior = if (isRoot) {
-		TopAppBarDefaults.exitUntilCollapsedScrollBehavior(rememberTopAppBarState())
-	} else {
-		TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
-	}
-
-	Column(
-		Modifier.padding(bottom = bottomPadding)
-	) {
-		if (isRoot) {
-			LargeTopAppBar(title = { Text("${page.title}") },
-				scrollBehavior = scrollBehavior,
-				actions = page.view?.let { viewActions(it) } ?: {})
-		} else {
-			TopAppBar(navigationIcon = {
-				IconButton(onClick = { navController.popBackStack() }) {
-					StandardIcon("ArrowBack")
-				}
-			},
-				title = { Text("${page.title}") },
-				scrollBehavior = scrollBehavior,
-				actions = page.view?.let { viewActions(it) } ?: {})
-		}
-
-		when (page.type) {
-			is PageType.Plain -> PlainPageRender(
-				id,
-				bottomPadding,
-				animatedVisibilityScope,
-				pageType = page.type,
-				view = page.view,
-				title = page.title,
-				searchPageId = page.searchPageId,
-				scrollBehavior = scrollBehavior,
-
-				)
-
-			is PageType.Post -> PostPageRender(
-				id,
-				bottomPadding,
-				animatedVisibilityScope,
-				pageType = page.type,
-				view = page.view,
-				title = page.title,
-				searchPageId = page.searchPageId,
-				scrollBehavior = scrollBehavior,
-			)
-
-			is PageType.Profile -> ProfilePageRender(
-				id,
-				bottomPadding,
-				animatedVisibilityScope,
-				pageType = page.type,
-				view = page.view,
-				title = page.title,
-				searchPageId = page.searchPageId,
-				scrollBehavior = scrollBehavior,
-			)
-		}
-
-	}
+fun PageRender(id: String, scrollConnection: NestedScrollConnection?) {
+	val page = usePage(id)
 
-}
-
-
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalSharedTransitionApi::class)
-@Composable
-fun SharedTransitionScope.ProfilePageRender(
-	id: String,
-	bottomPadding: Dp,
-	animatedVisibilityScope: AnimatedVisibilityScope?,
-	pageType: PageType.Profile,
-	view: View? = null,
-	title: String? = null,
-	searchPageId: String? = null,
-	scrollBehavior: TopAppBarScrollBehavior,
-) {
-	return
-}
-
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalSharedTransitionApi::class)
-@Composable
-fun SharedTransitionScope.PlainPageRender(
-	id: String,
-	bottomPadding: Dp,
-	animatedVisibilityScope: AnimatedVisibilityScope?,
-	pageType: PageType.Plain,
-	view: View? = null,
-	title: String? = null,
-	searchPageId: String? = null,
-	scrollBehavior: TopAppBarScrollBehavior,
-) {
-	if (view != null) ViewRender(view, scrollBehavior)
-	else return
-}
-
-
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalSharedTransitionApi::class)
-@Composable
-fun SharedTransitionScope.PostPageRender(
-	id: String,
-	bottomPadding: Dp,
-	animatedVisibilityScope: AnimatedVisibilityScope?,
-	pageType: PageType.Post,
-	view: View? = null,
-	title: String? = null,
-	searchPageId: String? = null,
-	scrollBehavior: TopAppBarScrollBehavior
-) {
-	val childPadding = PaddingValues(horizontal = 16.dp)
-
-	// TODO support multiple images, but keep in mind that probably only the first one should take part in
-	//  the shared element animation
-	pageType.imageUrls?.first()?.let { url ->
-		AsyncImage(
-			model = url,
-			contentDescription = "An image",
-			clipToBounds = true,
-			contentScale = ContentScale.Crop,
-			modifier = if (animatedVisibilityScope != null) {
-				Modifier.sharedElement(state = rememberSharedContentState("${id}/image"),
-					animatedVisibilityScope = animatedVisibilityScope,
-					boundsTransform = { _, _ ->
-						tween(durationMillis = 300)
-					})
-			} else {
-				Modifier
+	if (page !== null) {
+		page.view?.let {
+			CompositionLocalProvider(LocalScrollConnection.provides(scrollConnection)) {
+				ViewRender(it)
 			}
-				.padding(childPadding)
-				.clip(RoundedCornerShape(8))
-				.height(300.dp)
-				.fillMaxWidth()
-		)
+		}
 	}
 }
 
-@Composable
-fun viewActions(view: View): (@Composable RowScope.() -> Unit) {
-	println("FUNCTION CALLED, ${view}")
-
-
-	return {
-		if (view is View.FormView && view.actionStyle is FormActionStyle.TopBar) {
-			actionLayout(view)
-			println("INSIDE THE IF")
-		}
-	}
-}
\ No newline at end of file
+//@OptIn(ExperimentalSerializationApi::class)
+//@JsonClassDiscriminator("$")
+//@Serializable
+//sealed class PageType {
+//	@Serializable
+//	@SerialName("Post")
+//	data class Post(
+//		@Description("The images will be displayed in carousel form, directly below the title") val imageUrls: List<String>? = null,
+//		@Description("The page supertitle is displayed directly below any images on the page") val supertitle: String? = null,
+//		@Description("The additional info is displayed directly below any images on the page") val additionalInfo: String? = null,
+//	) : PageType()
+//
+//	@Serializable
+//	@SerialName("Profile")
+//	data class Profile(
+//		@Description("The the banner image for the user profile") val bannerImageUrl: String,
+//		@Description("The avatar image for the user profile") val avatarImageUrl: String,
+//	) : PageType()
+//
+//	@Serializable
+//	@SerialName("Plain")
+//	data class Plain(
+//		val icon: String? = null
+//	) : PageType()
+//}
+//
+//@OptIn(ExperimentalMaterial3Api::class, ExperimentalSharedTransitionApi::class)
+//@Composable
+//fun SharedTransitionScope.PageRender(
+//	id: String,
+//	bottomPadding: Dp,
+//	animatedVisibilityScope: AnimatedVisibilityScope?,
+//
+//	) {
+//	val page = usePage(id) ?: return
+//	val navController = useNavController()
+//	val layout = useDefaultLayout()
+//	val isRoot = layout.getRoots().contains(id)
+//
+//
+//	val scrollBehavior = if (isRoot) {
+//		TopAppBarDefaults.exitUntilCollapsedScrollBehavior(rememberTopAppBarState())
+//	} else {
+//		TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
+//	}
+//
+//	Column(
+//		Modifier.padding(bottom = bottomPadding)
+//	) {
+//		if (isRoot) {
+//			LargeTopAppBar(title = { Text("${page.title}") },
+//				scrollBehavior = scrollBehavior,
+//				actions = page.view?.let { viewActions(it) } ?: {})
+//		} else {
+//			TopAppBar(navigationIcon = {
+//				IconButton(onClick = { navController.popBackStack() }) {
+//					StandardIcon("ArrowBack")
+//				}
+//			},
+//				title = { Text("${page.title}") },
+//				scrollBehavior = scrollBehavior,
+//				actions = page.view?.let { viewActions(it) } ?: {})
+//		}
+//
+//		when (page.type) {
+//			is PageType.Plain -> PlainPageRender(
+//				id,
+//				bottomPadding,
+//				animatedVisibilityScope,
+//				pageType = page.type,
+//				view = page.view,
+//				title = page.title,
+//				searchPageId = page.searchPageId,
+//				scrollBehavior = scrollBehavior,
+//
+//				)
+//
+//			is PageType.Post -> PostPageRender(
+//				id,
+//				bottomPadding,
+//				animatedVisibilityScope,
+//				pageType = page.type,
+//				view = page.view,
+//				title = page.title,
+//				searchPageId = page.searchPageId,
+//				scrollBehavior = scrollBehavior,
+//			)
+//
+//			is PageType.Profile -> ProfilePageRender(
+//				id,
+//				bottomPadding,
+//				animatedVisibilityScope,
+//				pageType = page.type,
+//				view = page.view,
+//				title = page.title,
+//				searchPageId = page.searchPageId,
+//				scrollBehavior = scrollBehavior,
+//			)
+//		}
+//
+//	}
+//
+//}
+
+//@OptIn(ExperimentalMaterial3Api::class, ExperimentalSharedTransitionApi::class)
+//@Composable
+//fun SharedTransitionScope.ProfilePageRender(
+//	id: String,
+//	bottomPadding: Dp,
+//	animatedVisibilityScope: AnimatedVisibilityScope?,
+//	pageType: PageType.Profile,
+//	view: View? = null,
+//	title: String? = null,
+//	searchPageId: String? = null,
+//	scrollBehavior: TopAppBarScrollBehavior,
+//) {
+//	return
+//}
+
+//@OptIn(ExperimentalMaterial3Api::class, ExperimentalSharedTransitionApi::class)
+//@Composable
+//fun SharedTransitionScope.PlainPageRender(
+//	id: String,
+//	bottomPadding: Dp,
+//	animatedVisibilityScope: AnimatedVisibilityScope?,
+//	pageType: PageType.Plain,
+//	view: View? = null,
+//	title: String? = null,
+//	searchPageId: String? = null,
+//	scrollBehavior: TopAppBarScrollBehavior,
+//) {
+//	if (view != null) ViewRender(view, scrollBehavior)
+//	else return
+//}
+
+
+//@OptIn(ExperimentalMaterial3Api::class, ExperimentalSharedTransitionApi::class)
+//@Composable
+//fun SharedTransitionScope.PostPageRender(
+//	id: String,
+//	bottomPadding: Dp,
+//	animatedVisibilityScope: AnimatedVisibilityScope?,
+//	pageType: PageType.Post,
+//	view: View? = null,
+//	title: String? = null,
+//	searchPageId: String? = null,
+//	scrollBehavior: TopAppBarScrollBehavior
+//) {
+//	val childPadding = PaddingValues(horizontal = 16.dp)
+//
+//	// TODO support multiple images, but keep in mind that probably only the first one should take part in
+//	//  the shared element animation
+//	pageType.imageUrls?.first()?.let { url ->
+//		AsyncImage(
+//			model = url,
+//			contentDescription = "An image",
+//			clipToBounds = true,
+//			contentScale = ContentScale.Crop,
+//			modifier = if (animatedVisibilityScope != null) {
+//				Modifier.sharedElement(state = rememberSharedContentState("${id}/image"),
+//					animatedVisibilityScope = animatedVisibilityScope,
+//					boundsTransform = { _, _ ->
+//						tween(durationMillis = 300)
+//					})
+//			} else {
+//				Modifier
+//			}
+//				.padding(childPadding)
+//				.clip(RoundedCornerShape(8))
+//				.height(300.dp)
+//				.fillMaxWidth()
+//		)
+//	}
+//}
+//
+//@Composable
+//fun viewActions(view: View): (@Composable RowScope.() -> Unit) {
+//	println("FUNCTION CALLED, ${view}")
+//
+//
+//	return {
+//		if (view is View.FormView && view.actionStyle is FormActionStyle.TopBar) {
+//			actionLayout(view)
+//			println("INSIDE THE IF")
+//		}
+//	}
+//}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/objectionapp/Providers.kt b/app/src/main/java/com/example/objectionapp/Providers.kt
index 9d23673..f730378 100644
--- a/app/src/main/java/com/example/objectionapp/Providers.kt
+++ b/app/src/main/java/com/example/objectionapp/Providers.kt
@@ -2,10 +2,14 @@ package com.example.objectionapp
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -16,7 +20,10 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.zIndex
 import androidx.navigation.NavHostController
@@ -51,17 +58,12 @@ fun Provider(controller: Controller = Controller.fromConstants()) {
 		}
 
 		LaunchedEffect(Unit) {
-			println("main run")
 			controller.bridge.start(controller.wsUrl)
 
 			controller.bridge.onHasInternet.listen(ListenId()) {
 				hasInternet.value = it
 			}
 
-			controller.bridge.onHasInternet.listen(ListenId()) {
-				hasInternet.value = true
-			}
-
 			controller.bridge.onError.listen(ListenId()) {
 				error.value = it
 			}
@@ -79,24 +81,44 @@ fun Provider(controller: Controller = Controller.fromConstants()) {
 			}
 			if (isLoading) {
 				Box(modifier.zIndex(2f)) {
-					Column {
-						Text("Loading...", fontSize = 20.sp, color = textColor)
+					Column(
+						Modifier.fillMaxSize(),
+						verticalArrangement = Arrangement.Center,
+						horizontalAlignment = Alignment.CenterHorizontally
+					) {
+						CircularProgressIndicator(color = if (isDark) controller.darkLoaderColor else controller.lightLoaderColor)
 					}
 				}
 			}
 			if (!hasInternet.value) {
 				Box(modifier.zIndex(3f)) {
-					Column {
+					Column(
+						Modifier
+							.fillMaxSize()
+							.padding(16.dp),
+						verticalArrangement = Arrangement.Center,
+						horizontalAlignment = Alignment.CenterHorizontally
+					) {
 						Text(controller.noInternetHeader, fontSize = 30.sp, color = textColor)
-						Text(controller.noInternetContent, color = textColor)
+						Text(
+							controller.noInternetContent,
+							color = textColor,
+							textAlign = TextAlign.Center
+						)
 					}
 				}
 			}
 			if (error.value != null) {
 				Box(modifier.zIndex(3f)) {
-					Column {
+					Column(
+						Modifier
+							.fillMaxSize()
+							.padding(16.dp),
+						verticalArrangement = Arrangement.Center,
+						horizontalAlignment = Alignment.CenterHorizontally
+					) {
 						Text(controller.errorHeader, fontSize = 30.sp, color = textColor)
-						Text(error.value!!, color = textColor)
+						Text(error.value!!, color = textColor, textAlign = TextAlign.Center)
 					}
 				}
 			}
diff --git a/app/src/main/java/com/example/objectionapp/Schema.kt b/app/src/main/java/com/example/objectionapp/Schema.kt
index e02eafc..77f5352 100644
--- a/app/src/main/java/com/example/objectionapp/Schema.kt
+++ b/app/src/main/java/com/example/objectionapp/Schema.kt
@@ -18,7 +18,7 @@ import kotlinx.serialization.json.JsonClassDiscriminator
 
 @OptIn(ExperimentalSerializationApi::class)
 @SerialInfo
-@Target(AnnotationTarget.PROPERTY)
+@Target(AnnotationTarget.PROPERTY, AnnotationTarget.CLASS, AnnotationTarget.VALUE_PARAMETER)
 annotation class Description(val content: String)
 
 @OptIn(ExperimentalSerializationApi::class)
diff --git a/app/src/main/java/com/example/objectionapp/StandardIcon.kt b/app/src/main/java/com/example/objectionapp/StandardIcon.kt
index 6f56f82..e69de29 100644
--- a/app/src/main/java/com/example/objectionapp/StandardIcon.kt
+++ b/app/src/main/java/com/example/objectionapp/StandardIcon.kt
@@ -1,40 +0,0 @@
-package com.example.objectionapp
-
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.Home
-import androidx.compose.material.icons.rounded.QuestionMark
-import androidx.compose.material.icons.rounded.ShoppingBag
-import androidx.compose.material3.Icon
-import androidx.compose.material3.LocalContentColor
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.ImageVector
-import java.lang.System.console
-
-@Composable
-fun StandardIcon(
-    name: String,
-    modifier: Modifier = Modifier,
-    tint: Color = LocalContentColor.current,
-) {
-    val logger = useLogger("StandardIcon")
-    val theme = useDefaultTheme()
-    val icon: ImageVector? = remember(name) {
-        try {
-            val cl =
-                Class.forName("androidx.compose.material.icons.${theme.iconPack.getJavaName()}.${name}Kt")
-
-            val method = cl.declaredMethods.first()
-            method.invoke(null, theme.iconPack.getIcons()) as ImageVector
-        } catch (err: Throwable) {
-            logger.error("failed to load icon: $err")
-            null
-        }
-    }
-
-    if (icon == null) Icon(Icons.Rounded.QuestionMark, "no icon", tint = tint, modifier = modifier)
-    else Icon(icon, "$name icon", tint = tint, modifier = modifier)
-}
diff --git a/app/src/main/java/com/example/objectionapp/TabBar.kt b/app/src/main/java/com/example/objectionapp/TabBar.kt
index 5e82354..b81963b 100644
--- a/app/src/main/java/com/example/objectionapp/TabBar.kt
+++ b/app/src/main/java/com/example/objectionapp/TabBar.kt
@@ -1,357 +1,357 @@
-package com.example.objectionapp
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Button
-import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.NavigationBar
-import androidx.compose.material3.NavigationBarItem
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Tab
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.navigation.NavController
-import androidx.navigation.NavHostController
-import androidx.navigation.compose.currentBackStackEntryAsState
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonClassDiscriminator
-
-@OptIn(ExperimentalSerializationApi::class)
-@Serializable
-@JsonClassDiscriminator("$")
-sealed class SearchEmbedStrategy {
-	@Serializable
-	@SerialName("sheet")
-	data object Sheet : SearchEmbedStrategy()
-
-	@Serializable
-	@SerialName("page")
-	data object Page : SearchEmbedStrategy()
-}
-
-@Serializable
-data class TabBar(
-	val floating: Boolean = false,
-	@ObjectReference(Page::class) val pages: List<String>,
-	val searchEmbedStrategy: SearchEmbedStrategy? = null
-)
-
-@Composable
-fun TabBarRender(
-	tabBar: TabBar,
-) {
-	val navController = useNavController()
-	val currentBackStackEntry = navController.currentBackStackEntryAsState()
-	val currentPageId =
-		currentBackStackEntry.value?.arguments?.let { decodeObjectIdFromRouteArgs(it) }
-
-	Column(
-		horizontalAlignment = Alignment.CenterHorizontally,
-		verticalArrangement = Arrangement.spacedBy(20.dp),
-	) {
-		val searchPage = usePage(currentPageId)?.searchPageId
-
-		if (tabBar.floating) {
-			if (searchPage != null && tabBar.searchEmbedStrategy != null) FloatingSearchRender(
-				searchPage, tabBar.searchEmbedStrategy
-			)
-			FloatingNavigationRender(tabBar)
-		} else {
-			if (searchPage != null && tabBar.searchEmbedStrategy != null) SearchRender(
-				searchPage, tabBar.searchEmbedStrategy
-			)
-			NavigationRender(tabBar)
-		}
-	}
-
-}
-
-@Composable
-private fun SearchRender(currentPageId: String, searchEmbedStrategy: SearchEmbedStrategy) {
-	val page = usePage(currentPageId)
-
-	// TODO actually open the page when clicked
-
-	if (page != null) {
-		Column {
-			Box(
-				modifier = Modifier
-					.fillMaxWidth()
-					.padding(horizontal = 16.dp)
-					.padding(top = 16.dp)
-			) {
-				Box(
-					Modifier
-						.fillMaxWidth()
-						.clip(RoundedCornerShape(50))
-						.padding(vertical = 8.dp, horizontal = 16.dp)
-				) {
-					Row(
-						verticalAlignment = Alignment.CenterVertically,
-						horizontalArrangement = Arrangement.spacedBy(10.dp)
-					) {
-						RenderIcon(page)
-						StandardIcon(
-							"Search",
-							modifier = Modifier.size(30.dp),
-						)
-
-						Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
-							page.title?.let {
-								Text(
-									it,
-									color = MaterialTheme.colorScheme.onBackground,
-									fontSize = 16.sp,
-									fontWeight = FontWeight.Bold
-								)
-							}
-
-							page.subtitle?.let {
-								Text(
-									it,
-									color = MaterialTheme.colorScheme.onBackground,
-									fontSize = 14.sp,
-								)
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
-@Composable
-private fun FloatingSearchRender(
-	searchPageId: String, searchEmbedStrategy: SearchEmbedStrategy
-) {
-	val navController = useNavController()
-	val searchPage = usePage(searchPageId)
-
-	if (searchPage != null) {
-		Row {
-			Surface(
-				onClick = {
-					openSearch(navController, searchPageId, searchEmbedStrategy)
-				},
-				shadowElevation = 5.dp,
-				modifier = Modifier
-					.clip(RoundedCornerShape(60))
-					.height(50.dp)
-					.fillMaxWidth(),
-				color = MaterialTheme.colorScheme.surfaceVariant,
-			) {
-				Row(
-					verticalAlignment = Alignment.CenterVertically,
-					horizontalArrangement = Arrangement.spacedBy(10.dp),
-					modifier = Modifier.padding(horizontal = 10.dp)
-				) {
-					RenderIcon(searchPage, modifier = Modifier.size(30.dp))
-
-					searchPage.title?.let {
-						Text(
-							it,
-							color = MaterialTheme.colorScheme.onBackground,
-							fontSize = 16.sp,
-							fontWeight = FontWeight.Bold
-						)
-					}
-
-					searchPage.subtitle?.let {
-						Text(
-							it,
-							color = MaterialTheme.colorScheme.onBackground,
-							fontSize = 16.sp,
-							fontWeight = FontWeight.Bold
-						)
-					}
-				}
-			}
-		}
-	}
-}
-
-private fun openSearch(
-	navController: NavHostController, pageId: String, searchEmbedStrategy: SearchEmbedStrategy
-) {
-	when (searchEmbedStrategy) {
-		is SearchEmbedStrategy.Sheet -> navController.navigate(
-			route = encodeObjectIdIntoSheetRoute(
-				pageId
-			)
-		)
-
-		is SearchEmbedStrategy.Page -> navController.navigate(
-			route = encodeObjectIdIntoPageRoute(
-				pageId
-			)
-		)
-	}
-}
-
-@Composable
-private fun RenderIcon(page: Page, modifier: Modifier = Modifier) {
-	when (page.type) {
-		is PageType.Plain -> page.type.icon?.let { StandardIcon(it, modifier) }
-		else -> {}
-	}
-}
-
-@Composable
-private fun NavigationRender(tabBar: TabBar) {
-	NavigationBar {
-		NavigableTabBar(buttons = tabBar.pages.map { id ->
-			NavButton(pageId = id) { didClick, isActive ->
-				val page = usePage(id);
-
-				if (page != null) {
-					NavigationBarItem(
-						selected = isActive,
-						icon = { RenderIcon(page) },
-						onClick = { didClick() },
-					)
-				}
-			}
-		})
-	}
-}
-
-@Composable
-private fun FloatingNavigationRender(tabBar: TabBar) {
-	Column(
-		modifier = Modifier
-			.fillMaxWidth()
-			.padding(20.dp),
-		horizontalAlignment = Alignment.CenterHorizontally,
-	) {
-		Surface(
-			modifier = Modifier
-				.padding(0.dp)
-				.clip(RoundedCornerShape(60))
-				.height(50.dp),
-			color = MaterialTheme.colorScheme.inverseSurface,
-		) {
-			Row(
-				verticalAlignment = Alignment.CenterVertically,
-				horizontalArrangement = Arrangement.SpaceEvenly,
-				modifier = Modifier.padding(0.dp),
-			) {
-				NavigableTabBar(buttons = tabBar.pages.map { pageId ->
-					NavButton(pageId = pageId) { didClick, isActive ->
-						val page = usePage(pageId)
-
-						if (page !== null) {
-							Button(colors = ButtonDefaults.buttonColors(
-								containerColor = if (isActive) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.inverseSurface,
-								contentColor = if (isActive) MaterialTheme.colorScheme.onPrimary else MaterialTheme.colorScheme.inverseOnSurface,
-							),
-								modifier = Modifier.fillMaxHeight(),
-								shape = RoundedCornerShape(0),
-								onClick = { didClick() },
-								content = {
-									RenderIcon(page, modifier = Modifier.size(30.dp))
-								})
-						}
-					}
-				})
-			}
-		}
-	}
-}
-
-private data class NavButton(
-	val pageId: String,
-	val component: @Composable (() -> Unit, Boolean) -> Unit,
-)
-
-@Composable
-private fun NavigableTabBar(buttons: List<NavButton>) {
-	val navController = useNavController()
-	var currentButton by remember { mutableStateOf<String?>(null) }
-
-	DisposableEffect(Unit) {
-		val listener = NavController.OnDestinationChangedListener { _, _, arguments ->
-			val pageId = decodeObjectIdFromRouteArgs(arguments)
-
-			if (buttons.find { button -> button.pageId == pageId } != null) currentButton = pageId
-		}
-
-		navController.addOnDestinationChangedListener(listener)
-
-		onDispose {
-			navController.removeOnDestinationChangedListener(listener)
-		}
-	}
-
-	for (button in buttons) {
-		val isActive = currentButton == button.pageId
-		val onDidClick = {
-			navController.navigate(route = encodeObjectIdIntoPageRoute(button.pageId)) {
-				popUpTo(button.pageId)
-				launchSingleTop = true
-			}
-		}
-
-		button.component(onDidClick, isActive)
-	}
-}
-
-@Preview
-@Composable
-private fun FloatingTabBarTest() {
-	val controller = Controller.fromConstants()
-
-	controller.objectStore.preload(defaultThemeId, Theme())
-	controller.objectStore.preload(
-		defaultLayoutId, Layout(
-			tabBar = TabBar(
-				floating = true,
-				pages = listOf("some_page", "other_page"),
-				searchEmbedStrategy = SearchEmbedStrategy.Sheet
-			)
-		)
-	)
-
-	controller.objectStore.preload(
-		"some_page", Page(
-			title = "Hello there",
-			searchPageId = "search_page",
-			type = PageType.Plain(icon = "Lightbulb")
-		)
-	)
-	controller.objectStore.preload(
-		"other_page", Page(
-			title = "Other",
-			type = PageType.Plain(icon = "Home")
-		)
-	)
-	controller.objectStore.preload(
-		"search_page", Page(title = "Boston", type = PageType.Plain(icon = "Search"))
-	)
-
-	TestProvider(controller)
-}
+//package com.example.objectionapp
+//
+//import androidx.compose.foundation.layout.Arrangement
+//import androidx.compose.foundation.layout.Box
+//import androidx.compose.foundation.layout.Column
+//import androidx.compose.foundation.layout.Row
+//import androidx.compose.foundation.layout.fillMaxHeight
+//import androidx.compose.foundation.layout.fillMaxWidth
+//import androidx.compose.foundation.layout.height
+//import androidx.compose.foundation.layout.padding
+//import androidx.compose.foundation.layout.size
+//import androidx.compose.foundation.shape.RoundedCornerShape
+//import androidx.compose.material3.Button
+//import androidx.compose.material3.ButtonDefaults
+//import androidx.compose.material3.MaterialTheme
+//import androidx.compose.material3.NavigationBar
+//import androidx.compose.material3.NavigationBarItem
+//import androidx.compose.material3.Surface
+//import androidx.compose.material3.Tab
+//import androidx.compose.material3.Text
+//import androidx.compose.runtime.Composable
+//import androidx.compose.runtime.DisposableEffect
+//import androidx.compose.runtime.getValue
+//import androidx.compose.runtime.mutableStateOf
+//import androidx.compose.runtime.remember
+//import androidx.compose.runtime.setValue
+//import androidx.compose.ui.Alignment
+//import androidx.compose.ui.Modifier
+//import androidx.compose.ui.draw.clip
+//import androidx.compose.ui.graphics.Color
+//import androidx.compose.ui.text.font.FontWeight
+//import androidx.compose.ui.tooling.preview.Preview
+//import androidx.compose.ui.unit.dp
+//import androidx.compose.ui.unit.sp
+//import androidx.navigation.NavController
+//import androidx.navigation.NavHostController
+//import androidx.navigation.compose.currentBackStackEntryAsState
+//import kotlinx.serialization.ExperimentalSerializationApi
+//import kotlinx.serialization.SerialName
+//import kotlinx.serialization.Serializable
+//import kotlinx.serialization.json.JsonClassDiscriminator
+//
+//@OptIn(ExperimentalSerializationApi::class)
+//@Serializable
+//@JsonClassDiscriminator("$")
+//sealed class SearchEmbedStrategy {
+//	@Serializable
+//	@SerialName("sheet")
+//	data object Sheet : SearchEmbedStrategy()
+//
+//	@Serializable
+//	@SerialName("page")
+//	data object Page : SearchEmbedStrategy()
+//}
+//
+//@Serializable
+//data class TabBar(
+//	val floating: Boolean = false,
+//	@ObjectReference(Page::class) val pages: List<String>,
+//	val searchEmbedStrategy: SearchEmbedStrategy? = null
+//)
+//
+//@Composable
+//fun TabBarRender(
+//	tabBar: TabBar,
+//) {
+//	val navController = useNavController()
+//	val currentBackStackEntry = navController.currentBackStackEntryAsState()
+//	val currentPageId =
+//		currentBackStackEntry.value?.arguments?.let { decodeObjectIdFromRouteArgs(it) }
+//
+//	Column(
+//		horizontalAlignment = Alignment.CenterHorizontally,
+//		verticalArrangement = Arrangement.spacedBy(20.dp),
+//	) {
+//		val searchPage = usePage(currentPageId)?.searchPageId
+//
+//		if (tabBar.floating) {
+//			if (searchPage != null && tabBar.searchEmbedStrategy != null) FloatingSearchRender(
+//				searchPage, tabBar.searchEmbedStrategy
+//			)
+//			FloatingNavigationRender(tabBar)
+//		} else {
+//			if (searchPage != null && tabBar.searchEmbedStrategy != null) SearchRender(
+//				searchPage, tabBar.searchEmbedStrategy
+//			)
+//			NavigationRender(tabBar)
+//		}
+//	}
+//
+//}
+//
+//@Composable
+//private fun SearchRender(currentPageId: String, searchEmbedStrategy: SearchEmbedStrategy) {
+//	val page = usePage(currentPageId)
+//
+//	// TODO actually open the page when clicked
+//
+//	if (page != null) {
+//		Column {
+//			Box(
+//				modifier = Modifier
+//					.fillMaxWidth()
+//					.padding(horizontal = 16.dp)
+//					.padding(top = 16.dp)
+//			) {
+//				Box(
+//					Modifier
+//						.fillMaxWidth()
+//						.clip(RoundedCornerShape(50))
+//						.padding(vertical = 8.dp, horizontal = 16.dp)
+//				) {
+//					Row(
+//						verticalAlignment = Alignment.CenterVertically,
+//						horizontalArrangement = Arrangement.spacedBy(10.dp)
+//					) {
+//						RenderIcon(page)
+//						StandardIcon(
+//							"Search",
+//							modifier = Modifier.size(30.dp),
+//						)
+//
+//						Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
+//							page.title?.let {
+//								Text(
+//									it,
+//									color = MaterialTheme.colorScheme.onBackground,
+//									fontSize = 16.sp,
+//									fontWeight = FontWeight.Bold
+//								)
+//							}
+//
+//							page.subtitle?.let {
+//								Text(
+//									it,
+//									color = MaterialTheme.colorScheme.onBackground,
+//									fontSize = 14.sp,
+//								)
+//							}
+//						}
+//					}
+//				}
+//			}
+//		}
+//	}
+//}
+//
+//@Composable
+//private fun FloatingSearchRender(
+//	searchPageId: String, searchEmbedStrategy: SearchEmbedStrategy
+//) {
+//	val navController = useNavController()
+//	val searchPage = usePage(searchPageId)
+//
+//	if (searchPage != null) {
+//		Row {
+//			Surface(
+//				onClick = {
+//					openSearch(navController, searchPageId, searchEmbedStrategy)
+//				},
+//				shadowElevation = 5.dp,
+//				modifier = Modifier
+//					.clip(RoundedCornerShape(60))
+//					.height(50.dp)
+//					.fillMaxWidth(),
+//				color = MaterialTheme.colorScheme.surfaceVariant,
+//			) {
+//				Row(
+//					verticalAlignment = Alignment.CenterVertically,
+//					horizontalArrangement = Arrangement.spacedBy(10.dp),
+//					modifier = Modifier.padding(horizontal = 10.dp)
+//				) {
+//					RenderIcon(searchPage, modifier = Modifier.size(30.dp))
+//
+//					searchPage.title?.let {
+//						Text(
+//							it,
+//							color = MaterialTheme.colorScheme.onBackground,
+//							fontSize = 16.sp,
+//							fontWeight = FontWeight.Bold
+//						)
+//					}
+//
+//					searchPage.subtitle?.let {
+//						Text(
+//							it,
+//							color = MaterialTheme.colorScheme.onBackground,
+//							fontSize = 16.sp,
+//							fontWeight = FontWeight.Bold
+//						)
+//					}
+//				}
+//			}
+//		}
+//	}
+//}
+//
+//private fun openSearch(
+//	navController: NavHostController, pageId: String, searchEmbedStrategy: SearchEmbedStrategy
+//) {
+//	when (searchEmbedStrategy) {
+//		is SearchEmbedStrategy.Sheet -> navController.navigate(
+//			route = encodeObjectIdIntoSheetRoute(
+//				pageId
+//			)
+//		)
+//
+//		is SearchEmbedStrategy.Page -> navController.navigate(
+//			route = encodeObjectIdIntoPageRoute(
+//				pageId
+//			)
+//		)
+//	}
+//}
+//
+//@Composable
+//private fun RenderIcon(page: Page, modifier: Modifier = Modifier) {
+//	when (page.type) {
+//		is PageType.Plain -> page.type.icon?.let { StandardIcon(it, modifier) }
+//		else -> {}
+//	}
+//}
+//
+//@Composable
+//private fun NavigationRender(tabBar: TabBar) {
+//	NavigationBar {
+//		NavigableTabBar(buttons = tabBar.pages.map { id ->
+//			NavButton(pageId = id) { didClick, isActive ->
+//				val page = usePage(id);
+//
+//				if (page != null) {
+//					NavigationBarItem(
+//						selected = isActive,
+//						icon = { RenderIcon(page) },
+//						onClick = { didClick() },
+//					)
+//				}
+//			}
+//		})
+//	}
+//}
+//
+//@Composable
+//private fun FloatingNavigationRender(tabBar: TabBar) {
+//	Column(
+//		modifier = Modifier
+//			.fillMaxWidth()
+//			.padding(20.dp),
+//		horizontalAlignment = Alignment.CenterHorizontally,
+//	) {
+//		Surface(
+//			modifier = Modifier
+//				.padding(0.dp)
+//				.clip(RoundedCornerShape(60))
+//				.height(50.dp),
+//			color = MaterialTheme.colorScheme.inverseSurface,
+//		) {
+//			Row(
+//				verticalAlignment = Alignment.CenterVertically,
+//				horizontalArrangement = Arrangement.SpaceEvenly,
+//				modifier = Modifier.padding(0.dp),
+//			) {
+//				NavigableTabBar(buttons = tabBar.pages.map { pageId ->
+//					NavButton(pageId = pageId) { didClick, isActive ->
+//						val page = usePage(pageId)
+//
+//						if (page !== null) {
+//							Button(colors = ButtonDefaults.buttonColors(
+//								containerColor = if (isActive) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.inverseSurface,
+//								contentColor = if (isActive) MaterialTheme.colorScheme.onPrimary else MaterialTheme.colorScheme.inverseOnSurface,
+//							),
+//								modifier = Modifier.fillMaxHeight(),
+//								shape = RoundedCornerShape(0),
+//								onClick = { didClick() },
+//								content = {
+//									RenderIcon(page, modifier = Modifier.size(30.dp))
+//								})
+//						}
+//					}
+//				})
+//			}
+//		}
+//	}
+//}
+//
+//private data class NavButton(
+//	val pageId: String,
+//	val component: @Composable (() -> Unit, Boolean) -> Unit,
+//)
+//
+//@Composable
+//private fun NavigableTabBar(buttons: List<NavButton>) {
+//	val navController = useNavController()
+//	var currentButton by remember { mutableStateOf<String?>(null) }
+//
+//	DisposableEffect(Unit) {
+//		val listener = NavController.OnDestinationChangedListener { _, _, arguments ->
+//			val pageId = decodeObjectIdFromRouteArgs(arguments)
+//
+//			if (buttons.find { button -> button.pageId == pageId } != null) currentButton = pageId
+//		}
+//
+//		navController.addOnDestinationChangedListener(listener)
+//
+//		onDispose {
+//			navController.removeOnDestinationChangedListener(listener)
+//		}
+//	}
+//
+//	for (button in buttons) {
+//		val isActive = currentButton == button.pageId
+//		val onDidClick = {
+//			navController.navigate(route = encodeObjectIdIntoPageRoute(button.pageId)) {
+//				popUpTo(button.pageId)
+//				launchSingleTop = true
+//			}
+//		}
+//
+//		button.component(onDidClick, isActive)
+//	}
+//}
+//
+//@Preview
+//@Composable
+//private fun FloatingTabBarTest() {
+//	val controller = Controller.fromConstants()
+//
+//	controller.objectStore.preload(defaultThemeId, Theme())
+//	controller.objectStore.preload(
+//		defaultLayoutId, Layout(
+//			tabBar = TabBar(
+//				floating = true,
+//				pages = listOf("some_page", "other_page"),
+//				searchEmbedStrategy = SearchEmbedStrategy.Sheet
+//			)
+//		)
+//	)
+//
+//	controller.objectStore.preload(
+//		"some_page", Page(
+//			title = "Hello there",
+//			searchPageId = "search_page",
+//			type = PageType.Plain(icon = "Lightbulb")
+//		)
+//	)
+//	controller.objectStore.preload(
+//		"other_page", Page(
+//			title = "Other",
+//			type = PageType.Plain(icon = "Home")
+//		)
+//	)
+//	controller.objectStore.preload(
+//		"search_page", Page(title = "Boston", type = PageType.Plain(icon = "Search"))
+//	)
+//
+//	TestProvider(controller)
+//}
diff --git a/app/src/main/java/com/example/objectionapp/View.kt b/app/src/main/java/com/example/objectionapp/View.kt
index f1273da..fec62dd 100644
--- a/app/src/main/java/com/example/objectionapp/View.kt
+++ b/app/src/main/java/com/example/objectionapp/View.kt
@@ -1,204 +1,193 @@
-package com.example.objectionapp
-
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.TopAppBarScrollBehavior
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.text.input.KeyboardType
-import androidx.navigation.NavController
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonClassDiscriminator
-
-@OptIn(ExperimentalSerializationApi::class)
-@JsonClassDiscriminator("$")
-@Serializable
-sealed class View {
-	@Serializable
-	@SerialName("ListView")
-	data class ListView(
-		val items: List<List<ListViewItem>>, val trailingIcon: String?
-	) : View()
-
-	@Serializable
-	@SerialName("FormView")
-	data class FormView(
-		val items: List<FormItem>, val actionStyle: FormActionStyle, val actions: FormActions
-	) : View()
-}
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun ViewRender(view: View, scrollBehavior: TopAppBarScrollBehavior) {
-	when (view) {
-		is CardView -> CardViewRender(view, scrollBehavior)
-		is View.ListView -> ListView(view, scrollBehavior)
-		is View.FormView -> FormViewRender(view, scrollBehavior)
-		is ContentView -> ContentViewRender(view, scrollBehavior.nestedScrollConnection)
-	}
-}
-
-@OptIn(ExperimentalSerializationApi::class)
-@JsonClassDiscriminator("$")
-@Serializable
-sealed class FormActionStyle {
-	data object BottomFixed : FormActionStyle()
-	data object Relative : FormActionStyle()
-	data object TopBar : FormActionStyle()
-}
-
-@OptIn(ExperimentalSerializationApi::class)
-@JsonClassDiscriminator("$")
-@Serializable
-data class Link(
-	@ObjectReference(Page::class) val pageId: String, val useSheet: Boolean = false
-) {
-	fun follow(navController: NavController) {
-		navController.navigate(
-			if (useSheet) encodeObjectIdIntoSheetRoute(pageId)
-			else encodeObjectIdIntoPageRoute(pageId)
-		)
-	}
-}
-
-@OptIn(ExperimentalSerializationApi::class)
-@JsonClassDiscriminator("$")
-@Serializable
-data class FormActions(
-	val primaryAction: FormAction,
-	val secondaryAction: FormAction? = null,
-)
-
-@OptIn(ExperimentalSerializationApi::class)
-@JsonClassDiscriminator("$")
-@Serializable
-data class FormAction(
-	val title: String, val link: Link?
-)
-
-@OptIn(ExperimentalSerializationApi::class)
-@JsonClassDiscriminator("$")
-@Serializable
-sealed class FormActionColor {
-	data object Primary : FormActionColor()
-	data object Secondary : FormActionColor()
-	data object Error : FormActionColor()
-	data object Success : FormActionColor()
-	data object Warning : FormActionColor()
-}
-
-@OptIn(ExperimentalSerializationApi::class)
-@JsonClassDiscriminator("$")
-@Serializable
-sealed class FormActionLocation {
-	data object TopBar : FormActionLocation()
-	data object Page : FormActionLocation()
-}
-
-
-@Serializable
-data class FormItem(
-	val submitStrategy: SubmitStrategy,
-	val label: String?,
-	val description: String?,
-	val input: Input
-)
-
-@OptIn(ExperimentalSerializationApi::class)
-@JsonClassDiscriminator("$")
-@Serializable
-sealed class InputMode() {
-	data class Text(val multiline: Boolean = false, val trailingIcon: String? = null) : InputMode()
-	data object Ascii : InputMode()
-	data object Number : InputMode()
-	data object Phone : InputMode()
-	data object Uri : InputMode()
-	data object Email : InputMode()
-	data object Password : InputMode()
-	data object NumberPassword : InputMode()
-	data object Decimal : InputMode()
-
-	fun getKeyboardType(): KeyboardType {
-		return when (this) {
-			is Text -> KeyboardType.Text
-			is Ascii -> KeyboardType.Ascii
-			is Number -> KeyboardType.Number
-			is Phone -> KeyboardType.Phone
-			is Uri -> KeyboardType.Uri
-			is Email -> KeyboardType.Email
-			is Password -> KeyboardType.Password
-			is NumberPassword -> KeyboardType.NumberPassword
-			is Decimal -> KeyboardType.Decimal
-		}
-	}
-}
-
-@OptIn(ExperimentalSerializationApi::class)
-@JsonClassDiscriminator("$")
-@Serializable
-sealed class Input() {
-	@Serializable
-	data class Text(
-		var startingValue: Binding<String>,
-		var readOnly: Boolean = false,
-		val fieldStatus: TextFieldStatus? = null,
-		val placeholder: String? = null,
-		val mode: InputMode
-	) : Input()
-
+//package com.example.objectionapp
+//
+//import androidx.compose.material3.ExperimentalMaterial3Api
+//import androidx.compose.material3.TopAppBarScrollBehavior
+//import androidx.compose.runtime.Composable
+//import androidx.compose.ui.text.input.KeyboardType
+//import com.example.objectionapp.view.CardView
+//import com.example.objectionapp.view.CardViewRender
+//import kotlinx.serialization.ExperimentalSerializationApi
+//import kotlinx.serialization.SerialName
+//import kotlinx.serialization.Serializable
+//import kotlinx.serialization.json.JsonClassDiscriminator
+//
+////@OptIn(ExperimentalSerializationApi::class)
+////@JsonClassDiscriminator("$")
+////@Serializable
+////sealed class View {
+////	@Serializable
+////	@SerialName("ListView")
+////	data class ListView(
+////		val items: List<List<ListViewItem>>, val trailingIcon: String?
+////	) : View()
+////
+////	@Serializable
+////	@SerialName("FormView")
+////	data class FormView(
+////		val items: List<FormItem>, val actionStyle: FormActionStyle, val actions: FormActions
+////	) : View()
+////}
+//
+//@OptIn(ExperimentalMaterial3Api::class)
+//@Composable
+//fun ViewRender(view: View) {
+//	when (view) {
+//		is CardView -> CardViewRender(view, scrollBehavior)
+//		is View.ListView -> ListView(view, scrollBehavior)
+//		is View.FormView -> FormViewRender(view, scrollBehavior)
+//		is ContentView -> ContentViewRender(view, scrollBehavior.nestedScrollConnection)
+//	}
+//}
+//
+//@OptIn(ExperimentalSerializationApi::class)
+//@JsonClassDiscriminator("$")
+//@Serializable
+//sealed class FormActionStyle {
+//	data object BottomFixed : FormActionStyle()
+//	data object Relative : FormActionStyle()
+//	data object TopBar : FormActionStyle()
+//}
+//
+//
+//
+//@OptIn(ExperimentalSerializationApi::class)
+//@JsonClassDiscriminator("$")
+//@Serializable
+//data class FormActions(
+//	val primaryAction: FormAction,
+//	val secondaryAction: FormAction? = null,
+//)
+//
+//@OptIn(ExperimentalSerializationApi::class)
+//@JsonClassDiscriminator("$")
+//@Serializable
+//data class FormAction(
+//	val title: String, val link: Link?
+//)
+//
+//@OptIn(ExperimentalSerializationApi::class)
+//@JsonClassDiscriminator("$")
+//@Serializable
+//sealed class FormActionColor {
+//	data object Primary : FormActionColor()
+//	data object Secondary : FormActionColor()
+//	data object Error : FormActionColor()
+//	data object Success : FormActionColor()
+//	data object Warning : FormActionColor()
+//}
+//
+//@OptIn(ExperimentalSerializationApi::class)
+//@JsonClassDiscriminator("$")
+//@Serializable
+//sealed class FormActionLocation {
+//	data object TopBar : FormActionLocation()
+//	data object Page : FormActionLocation()
+//}
+//
+//
+//@Serializable
+//data class FormItem(
+//	val submitStrategy: SubmitStrategy,
+//	val label: String?,
+//	val description: String?,
+//	val input: Input
+//)
+//
+//@OptIn(ExperimentalSerializationApi::class)
+//@JsonClassDiscriminator("$")
+//@Serializable
+//sealed class InputMode() {
+//	data class Text(val multiline: Boolean = false, val trailingIcon: String? = null) : InputMode()
+//	data object Ascii : InputMode()
+//	data object Number : InputMode()
+//	data object Phone : InputMode()
+//	data object Uri : InputMode()
+//	data object Email : InputMode()
+//	data object Password : InputMode()
+//	data object NumberPassword : InputMode()
+//	data object Decimal : InputMode()
+//
+//	fun getKeyboardType(): KeyboardType {
+//		return when (this) {
+//			is Text -> KeyboardType.Text
+//			is Ascii -> KeyboardType.Ascii
+//			is Number -> KeyboardType.Number
+//			is Phone -> KeyboardType.Phone
+//			is Uri -> KeyboardType.Uri
+//			is Email -> KeyboardType.Email
+//			is Password -> KeyboardType.Password
+//			is NumberPassword -> KeyboardType.NumberPassword
+//			is Decimal -> KeyboardType.Decimal
+//		}
+//	}
+//}
+//
+//@OptIn(ExperimentalSerializationApi::class)
+//@JsonClassDiscriminator("$")
+//@Serializable
+//sealed class Input() {
+//	@Serializable
+//	data class Text(
+//		var startingValue: Binding<String>,
+//		var readOnly: Boolean = false,
+//		val fieldStatus: TextFieldStatus? = null,
+//		val placeholder: String? = null,
+//		val mode: InputMode
+//	) : Input()
+//
+////	@Serializable
+////	data object File : Input()
+////
+////	@Serializable
+////	data object ProfilePicture : Input()
+//
+//	@Serializable
+//	data class Switch(
+//		val switched: Binding<Boolean>,
+//	) : Input()
+//}
+//
+//@OptIn(ExperimentalSerializationApi::class)
+//@JsonClassDiscriminator("$")
+//@Serializable
+//sealed class TextFieldStatus {
+//	data object Error : TextFieldStatus()
+//	data object Disabled : TextFieldStatus()
+//}
+//
+//@OptIn(ExperimentalSerializationApi::class)
+//@JsonClassDiscriminator("$")
+//@Serializable
+//sealed class SubmitStrategy {
+//	data object OnBlur : SubmitStrategy()
+//	data object OnKeyUp : SubmitStrategy()
+//	data object OnSubmit : SubmitStrategy()
+//}
+//
+//
+//@OptIn(ExperimentalSerializationApi::class)
+//@Serializable
+//@JsonClassDiscriminator("$")
+//sealed class CardContainer {
+//	@Serializable
+//	@SerialName("SingularCardContainer")
+//	data class SingularCardContainer(
+//		@ObjectReference(Page::class) val objectId: String,
+//	) : CardContainer()
+//
 //	@Serializable
-//	data object File : Input()
+//	@SerialName("PluralCardContainer")
+//	data class PluralCardContainer(
+//		@ObjectReference(Page::class) val objectIds: List<String>,
+//		val title: String? = null,
+//	) : CardContainer()
 //
 //	@Serializable
-//	data object ProfilePicture : Input()
-
-	@Serializable
-	data class Switch(
-		val switched: Binding<Boolean>,
-	) : Input()
-}
-
-@OptIn(ExperimentalSerializationApi::class)
-@JsonClassDiscriminator("$")
-@Serializable
-sealed class TextFieldStatus {
-	data object Error : TextFieldStatus()
-	data object Disabled : TextFieldStatus()
-}
-
-@OptIn(ExperimentalSerializationApi::class)
-@JsonClassDiscriminator("$")
-@Serializable
-sealed class SubmitStrategy {
-	data object OnBlur : SubmitStrategy()
-	data object OnKeyUp : SubmitStrategy()
-	data object OnSubmit : SubmitStrategy()
-}
-
-
-@OptIn(ExperimentalSerializationApi::class)
-@Serializable
-@JsonClassDiscriminator("$")
-sealed class CardContainer {
-	@Serializable
-	@SerialName("SingularCardContainer")
-	data class SingularCardContainer(
-		@ObjectReference(Page::class) val objectId: String,
-	) : CardContainer()
-
-	@Serializable
-	@SerialName("PluralCardContainer")
-	data class PluralCardContainer(
-		@ObjectReference(Page::class) val objectIds: List<String>,
-		val title: String? = null,
-	) : CardContainer()
-
-	@Serializable
-	@SerialName("CustomCardContainer")
-	data class CustomCardContainer(
-		@ObjectReference(Page::class) val objectId: String? = null,
-		val title: String? = null,
-		val icon: String? = null,
-		val imageUrl: String? = null
-	) : CardContainer()
-}
+//	@SerialName("CustomCardContainer")
+//	data class CustomCardContainer(
+//		@ObjectReference(Page::class) val objectId: String? = null,
+//		val title: String? = null,
+//		val icon: String? = null,
+//		val imageUrl: String? = null
+//	) : CardContainer()
+//}
diff --git a/app/src/main/java/com/example/objectionapp/view/AppBar.kt b/app/src/main/java/com/example/objectionapp/view/AppBar.kt
new file mode 100644
index 0000000..7da6a56
--- /dev/null
+++ b/app/src/main/java/com/example/objectionapp/view/AppBar.kt
@@ -0,0 +1,281 @@
+package com.example.objectionapp.view
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.NavigationBar
+import androidx.compose.material3.NavigationBarItem
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.navigation.NavController
+import com.example.objectionapp.Controller
+import com.example.objectionapp.Layout
+import com.example.objectionapp.Link
+import com.example.objectionapp.ObjectReference
+import com.example.objectionapp.Page
+import com.example.objectionapp.TestProvider
+import com.example.objectionapp.Theme
+import com.example.objectionapp.decodeObjectIdFromRouteArgs
+import com.example.objectionapp.defaultLayoutId
+import com.example.objectionapp.defaultThemeId
+import com.example.objectionapp.encodeObjectIdIntoPageRoute
+import com.example.objectionapp.useNavController
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TabBarButton(
+	@ObjectReference(Page::class) val pageId: String,
+	val text: String,
+	val icon: String,
+)
+
+@Serializable
+data class TabBar(
+	val floating: Boolean = false, val buttons: List<TabBarButton>, val searchView: View? = null
+)
+
+@Composable
+fun TabBarRender(tabBar: TabBar) {
+	Column(
+		horizontalAlignment = Alignment.CenterHorizontally,
+		verticalArrangement = Arrangement.spacedBy(20.dp),
+	) {
+		if (tabBar.floating) {
+			tabBar.searchView?.let { ViewRender(it) }
+			FloatingNavigationRender(tabBar.buttons)
+		} else {
+//			tabBar.searchButton?.let { SearchRender(it) }
+			NavigationRender(tabBar.buttons)
+		}
+	}
+
+}
+
+//@Composable
+//private fun SearchRender(button: TabBarSearchButton) {
+//	// TODO actually open the page when clicked
+//
+//	Column {
+//		Box(
+//			modifier = Modifier
+//				.fillMaxWidth()
+//				.padding(horizontal = 16.dp)
+//				.padding(top = 16.dp)
+//		) {
+//			Box(
+//				Modifier
+//					.fillMaxWidth()
+//					.clip(RoundedCornerShape(50))
+//					.padding(vertical = 8.dp, horizontal = 16.dp)
+//			) {
+//				Row(
+//					verticalAlignment = Alignment.CenterVertically,
+//					horizontalArrangement = Arrangement.spacedBy(10.dp)
+//				) {
+//					IconViewRender(IconView(name = button.icon, styles = listOf(Style.Size(30F))))
+//
+//					Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
+//						Text(
+//							button.text,
+//							color = MaterialTheme.colorScheme.onBackground,
+//							fontSize = 16.sp,
+//							fontWeight = FontWeight.Bold
+//						)
+//					}
+//				}
+//			}
+//		}
+//	}
+//}
+
+@Serializable
+@SerialName("FloatingBottomSearchBar")
+data class FloatingBottomSearchBarView(
+	val icon: String, val text: String, val link: Link
+) : View()
+
+@Composable
+fun FloatingBottomSearchBarViewRender(view: FloatingBottomSearchBarView) {
+	val navController = useNavController()
+
+	Row(Modifier.padding(horizontal = 16.dp)) {
+		Surface(
+			onClick = {
+				view.link.follow(navController, false)
+			},
+			shadowElevation = 100.dp,
+			modifier = Modifier
+				.shadow(10.dp)
+				.clip(RoundedCornerShape(60))
+				.height(50.dp)
+				.fillMaxWidth(),
+			color = MaterialTheme.colorScheme.inverseSurface,
+		) {
+			Row(
+				verticalAlignment = Alignment.CenterVertically,
+				horizontalArrangement = Arrangement.spacedBy(10.dp),
+				modifier = Modifier.padding(horizontal = 10.dp)
+			) {
+				CompositionLocalProvider(LocalContentColor.provides(MaterialTheme.colorScheme.inverseOnSurface)) {
+					IconViewRender(IconView(name = view.icon, styles = listOf(Style.Size(30F))))
+
+					Text(
+						view.text, fontSize = 16.sp, fontWeight = FontWeight.Bold
+					)
+				}
+			}
+		}
+	}
+}
+
+@Composable
+private fun NavigationRender(buttons: List<TabBarButton>) {
+	NavigationBar {
+		NavigableTabBar(buttons = buttons.map { button ->
+			NavButton(pageId = button.pageId) { didClick, isActive ->
+				NavigationBarItem(
+					selected = isActive,
+					icon = { IconViewRender(IconView(name = button.icon)) },
+					onClick = { didClick() },
+				)
+			}
+		})
+	}
+}
+
+@Composable
+private fun FloatingNavigationRender(buttons: List<TabBarButton>) {
+	Column(
+		modifier = Modifier
+			.fillMaxWidth()
+			.padding(bottom = 40.dp),
+		horizontalAlignment = Alignment.CenterHorizontally,
+	) {
+		Surface(
+			modifier = Modifier
+				.padding(0.dp)
+				.shadow(10.dp)
+				.clip(RoundedCornerShape(60))
+				.height(50.dp),
+			color = MaterialTheme.colorScheme.inverseSurface,
+		) {
+			Row(
+				verticalAlignment = Alignment.CenterVertically,
+				horizontalArrangement = Arrangement.SpaceEvenly,
+				modifier = Modifier.padding(0.dp),
+			) {
+				NavigableTabBar(buttons = buttons.map { button ->
+					NavButton(pageId = button.pageId) { didClick, isActive ->
+						Button(colors = ButtonDefaults.buttonColors(
+							containerColor = if (isActive) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.inverseSurface,
+							contentColor = if (isActive) MaterialTheme.colorScheme.onPrimary else MaterialTheme.colorScheme.inverseOnSurface,
+						),
+							modifier = Modifier.fillMaxHeight(),
+							shape = RoundedCornerShape(0),
+							onClick = { didClick() },
+							content = {
+								IconViewRender(
+									IconView(
+										name = button.icon, styles = listOf(Style.Size(30F))
+									)
+								)
+							})
+					}
+				})
+			}
+		}
+	}
+}
+
+private data class NavButton(
+	val pageId: String,
+	val component: @Composable (() -> Unit, Boolean) -> Unit,
+)
+
+@Composable
+private fun NavigableTabBar(buttons: List<NavButton>) {
+	val navController = useNavController()
+	var currentButton by remember { mutableStateOf<String?>(null) }
+
+	DisposableEffect(Unit) {
+		val listener = NavController.OnDestinationChangedListener { _, _, arguments ->
+			val pageId = decodeObjectIdFromRouteArgs(arguments!!)
+
+			println("clicked $pageId")
+			if (buttons.find { button -> button.pageId == pageId } != null) currentButton = pageId
+		}
+
+		navController.addOnDestinationChangedListener(listener)
+
+		onDispose {
+			navController.removeOnDestinationChangedListener(listener)
+		}
+	}
+
+	for (button in buttons) {
+		val isActive = currentButton == button.pageId
+		val onDidClick = {
+			navController.navigate(route = encodeObjectIdIntoPageRoute(button.pageId)) {
+				popUpTo(button.pageId)
+				launchSingleTop = true
+			}
+		}
+
+		button.component(onDidClick, isActive)
+	}
+}
+
+@Preview
+@Composable
+private fun FloatingTabBarTest() {
+	val controller = Controller.fromConstants()
+
+	controller.objectStore.preload(defaultThemeId, Theme())
+	controller.objectStore.preload(
+		defaultLayoutId, Layout(
+			tabBar = TabBar(
+				floating = true, buttons = listOf(
+					TabBarButton(
+						pageId = "some_page", text = "Some", icon = "Lightbulb"
+					)
+				), searchView = FloatingBottomSearchBarView(
+					icon = "Search",
+					link = Link(pageId = "search_page", useSheet = true),
+					text = "Search..."
+				)
+			)
+		)
+	)
+
+	controller.objectStore.preload("some_page", Page())
+	controller.objectStore.preload("other_page", Page())
+	controller.objectStore.preload("search_page", Page())
+
+	TestProvider(controller)
+}
diff --git a/app/src/main/java/com/example/objectionapp/view/Box.kt b/app/src/main/java/com/example/objectionapp/view/Box.kt
new file mode 100644
index 0000000..0a75c10
--- /dev/null
+++ b/app/src/main/java/com/example/objectionapp/view/Box.kt
@@ -0,0 +1,39 @@
+package com.example.objectionapp.view
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
+import com.example.objectionapp.view.Style
+import com.example.objectionapp.view.ThemeColor
+import com.example.objectionapp.view.compileStyles
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+@SerialName("Box")
+data class BoxView(
+	val color: ThemeColor? = null,
+	val intenseColor: Boolean? = null,
+	val styles: List<Style>? = null,
+	val content: View? = null,
+) : View()
+
+@Composable
+fun BoxViewRender(view: BoxView) {
+	val modifier =
+		if (view.color != null) Modifier.background(view.color.getContainerColor(view.intenseColor)) else Modifier
+
+	Box(modifier = compileStyles(view.styles, modifier)) {
+		if (view.color != null) {
+			CompositionLocalProvider(LocalContentColor provides view.color.getContentColor(view.intenseColor)) {
+				view.content?.let { ViewRender(it) }
+			}
+		} else {
+			view.content?.let { ViewRender(it) }
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/objectionapp/view/Button.kt b/app/src/main/java/com/example/objectionapp/view/Button.kt
new file mode 100644
index 0000000..a6ce978
--- /dev/null
+++ b/app/src/main/java/com/example/objectionapp/view/Button.kt
@@ -0,0 +1,38 @@
+package com.example.objectionapp.view
+
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonColors
+import androidx.compose.runtime.Composable
+import com.example.objectionapp.Link
+import com.example.objectionapp.useNavController
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+@SerialName("Button")
+data class ButtonView(
+	val link: Link,
+	val content: View? = null,
+	val styles: List<Style>? = null,
+	val color: ThemeColor? = null,
+	val intenseColor: Boolean? = false,
+) : View()
+
+@Composable
+fun ButtonViewRender(view: ButtonView) {
+	val navController = useNavController()
+	val color = view.color ?: ThemeColor.Surface
+
+	Button(modifier = compileStyles(view.styles),
+		// TODO correct popup so that it is correct
+		onClick = { view.link.follow(navController, false) },
+		colors = ButtonColors(
+			contentColor = color.getContentColor(view.intenseColor),
+			containerColor = color.getContainerColor(view.intenseColor),
+			disabledContentColor = color.getContentColor(view.intenseColor),
+			disabledContainerColor = color.getContainerColor(view.intenseColor)
+		),
+		content = {
+			view.content?.let { ViewRender(it) }
+		})
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/objectionapp/view/Center.kt b/app/src/main/java/com/example/objectionapp/view/Center.kt
new file mode 100644
index 0000000..0324000
--- /dev/null
+++ b/app/src/main/java/com/example/objectionapp/view/Center.kt
@@ -0,0 +1,42 @@
+package com.example.objectionapp.view
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.runtime.Composable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+@SerialName("CenterHorizontally")
+data class CenterHorizontalView(
+	val styles: List<Style>? = null, val content: View
+) : View()
+
+@Composable
+fun CenterHorizontalRender(view: CenterHorizontalView) {
+	Row(
+		compileStyles(view.styles).fillMaxWidth(),
+		horizontalArrangement = Arrangement.Center,
+	) {
+		ViewRender(view.content)
+	}
+}
+
+@Serializable
+@SerialName("CenterVertically")
+data class CenterVerticalView(
+	val styles: List<Style>? = null, val content: View
+) : View()
+
+@Composable
+fun CenterVerticalViewRender(view: CenterVerticalView) {
+	Column(
+		compileStyles(view.styles).fillMaxHeight(),
+		verticalArrangement = Arrangement.Center,
+	) {
+		ViewRender(view.content)
+	}
+}
diff --git a/app/src/main/java/com/example/objectionapp/view/Flex.kt b/app/src/main/java/com/example/objectionapp/view/Flex.kt
new file mode 100644
index 0000000..674baef
--- /dev/null
+++ b/app/src/main/java/com/example/objectionapp/view/Flex.kt
@@ -0,0 +1,243 @@
+package com.example.objectionapp.view
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.compositionLocalOf
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
+import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.unit.dp
+import com.example.objectionapp.ContentKey
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonClassDiscriminator
+import kotlin.collections.listOf
+
+@OptIn(ExperimentalSerializationApi::class)
+@Serializable
+@JsonClassDiscriminator("$")
+sealed class HorizontalAlignment {
+	@Serializable
+	data object Center : HorizontalAlignment()
+
+	@Serializable
+	data object Start : HorizontalAlignment()
+
+	@Serializable
+	data object End : HorizontalAlignment()
+
+	fun toHorizontalAlignment(): Alignment.Horizontal {
+		return when (this) {
+			is Center -> Alignment.CenterHorizontally
+			is Start -> Alignment.Start
+			is End -> Alignment.End
+		}
+	}
+}
+
+@OptIn(ExperimentalSerializationApi::class)
+@Serializable
+@JsonClassDiscriminator("$")
+sealed class VerticalAlignment {
+	@Serializable
+	data object Center : VerticalAlignment()
+
+	@Serializable
+	data object Top : VerticalAlignment()
+
+	@Serializable
+	data object Bottom : VerticalAlignment()
+
+	fun toVerticalAlignment(): Alignment.Vertical {
+		return when (this) {
+			is Center -> Alignment.CenterVertically
+			is Top -> Alignment.Top
+			is Bottom -> Alignment.Bottom
+		}
+	}
+}
+
+@OptIn(ExperimentalSerializationApi::class)
+@JsonClassDiscriminator("$")
+@ContentKey("def")
+@Serializable
+sealed class ContentPadding {
+	@Serializable
+	@SerialName("Padding")
+	data class All(val def: Float) : ContentPadding()
+
+	@Serializable
+	@SerialName("Horizontal")
+	data class Horizontal(val def: Float) : ContentPadding()
+
+	@Serializable
+	@SerialName("Vertical")
+	data class Vertical(val def: Float) : ContentPadding()
+
+	@Serializable
+	@SerialName("Top")
+	data class Top(val def: Float) : ContentPadding()
+
+	@Serializable
+	@SerialName("Bottom")
+	data class Bottom(val def: Float) : ContentPadding()
+
+	@Serializable
+	@SerialName("Start")
+	data class Start(val def: Float) : ContentPadding()
+
+	@Serializable
+	@SerialName("End")
+	data class End(val def: Float) : ContentPadding()
+}
+
+fun compilePaddingValues(padding: List<ContentPadding>): PaddingValues {
+	var top = 0F;
+	var bottom = 0F;
+	var start = 0F;
+	var end = 0F;
+
+	for (item in padding) {
+		when (item) {
+			is ContentPadding.All -> {
+				top = item.def
+				bottom = item.def
+				start = item.def
+				end = item.def
+			}
+
+			is ContentPadding.Horizontal -> {
+				start = item.def
+				end = item.def
+			}
+
+			is ContentPadding.Vertical -> {
+				top = item.def
+				bottom = item.def
+			}
+
+			is ContentPadding.Top -> top = item.def
+			is ContentPadding.Bottom -> bottom = item.def
+			is ContentPadding.Start -> start = item.def
+			is ContentPadding.End -> end = item.def
+		}
+	}
+
+	return PaddingValues(top = top.dp, bottom = bottom.dp, start = start.dp, end = end.dp)
+}
+
+@Serializable
+data class FlexItem(
+	val expand: Boolean? = null,
+	val content: View,
+)
+
+@Serializable
+@SerialName("Column")
+data class ColumnView(
+	val styles: List<Style>? = null,
+	val spacing: Float? = null,
+	val items: List<FlexItem>? = null,
+	val alignment: HorizontalAlignment? = null
+) : View()
+
+@Composable
+fun ColumnViewRender(view: ColumnView) {
+	Column(
+		verticalArrangement = Arrangement.spacedBy((view.spacing ?: 0F).dp),
+		modifier = compileStyles(view.styles),
+		horizontalAlignment = (view.alignment ?: HorizontalAlignment.Start).toHorizontalAlignment()
+	) {
+		for (item in view.items ?: listOf()) {
+			Box(if (item.expand == true) Modifier.weight(1F) else Modifier) {
+				ViewRender(item.content)
+			}
+		}
+	}
+}
+
+var LocalScrollConnection = compositionLocalOf<NestedScrollConnection?> { null }
+
+@Serializable
+@SerialName("ScrollingColumn")
+data class ScrollingColumnView(
+	val styles: List<Style>? = null,
+	val spacing: Float? = null,
+	val items: List<View>? = null,
+	val contentPadding: List<ContentPadding>? = null
+) : View()
+
+@Composable
+fun ScrollingColumnViewRender(view: ScrollingColumnView) {
+	val modifier = LocalScrollConnection.current?.let { Modifier.nestedScroll(it) } ?: Modifier
+
+	LazyColumn(verticalArrangement = Arrangement.spacedBy((view.spacing ?: 0F).dp),
+		contentPadding = compilePaddingValues(view.contentPadding ?: listOf()),
+		modifier = compileStyles(view.styles, modifier),
+		content = {
+			for (child in view.items ?: listOf()) {
+				item {
+					CompositionLocalProvider(LocalScrollConnection.provides(null)) {
+						ViewRender(child)
+					}
+				}
+			}
+		})
+}
+
+@Serializable
+@SerialName("Row")
+data class RowView(
+	val styles: List<Style>? = null,
+	val spacing: Float? = null,
+	val items: List<FlexItem>? = null,
+	val alignment: VerticalAlignment? = null
+) : View()
+
+@Composable
+fun RowViewRender(view: RowView) {
+	Row(
+		modifier = compileStyles(view.styles),
+		horizontalArrangement = Arrangement.spacedBy((view.spacing ?: 0.0).toInt().dp),
+		verticalAlignment = (view.alignment ?: VerticalAlignment.Top).toVerticalAlignment()
+	) {
+		for (child in view.items ?: listOf()) {
+			Box(if (child.expand == true) Modifier.weight(1F) else Modifier) {
+				ViewRender(child.content)
+			}
+		}
+	}
+}
+
+@Serializable
+@SerialName("ScrollingRow")
+data class ScrollingRowView(
+	val styles: List<Style>? = null,
+	val spacing: Float? = null,
+	val items: List<View>? = null,
+	val contentPadding: List<ContentPadding>? = null
+) : View()
+
+@Composable
+fun ScrollingRowViewRender(view: ScrollingRowView) {
+	LazyRow(
+		modifier = compileStyles(view.styles),
+		horizontalArrangement = Arrangement.spacedBy((view.spacing ?: 0F).dp),
+		contentPadding = compilePaddingValues(view.contentPadding ?: listOf()),
+	) {
+		for (child in view.items ?: listOf()) {
+			item {
+				ViewRender(child)
+			}
+		}
+	}
+}
diff --git a/app/src/main/java/com/example/objectionapp/view/Icon.kt b/app/src/main/java/com/example/objectionapp/view/Icon.kt
new file mode 100644
index 0000000..5cb1fda
--- /dev/null
+++ b/app/src/main/java/com/example/objectionapp/view/Icon.kt
@@ -0,0 +1,41 @@
+package com.example.objectionapp.view
+
+import com.example.objectionapp.useDefaultTheme
+import com.example.objectionapp.useLogger
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.QuestionMark
+import androidx.compose.material3.Icon
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.graphics.vector.ImageVector
+
+@Serializable
+@SerialName("Icon")
+data class IconView(
+	val styles: List<Style>? = null, val name: String
+) : View()
+
+@Composable
+fun IconViewRender(view: IconView) {
+	val logger = useLogger("StandardIcon")
+	val theme = useDefaultTheme()
+	val icon: ImageVector? = remember(view.name) {
+		try {
+			val cl =
+				Class.forName("androidx.compose.material.icons.${theme.iconPack.getJavaName()}.${view.name}Kt")
+
+			val method = cl.declaredMethods.first()
+			method.invoke(null, theme.iconPack.getIcons()) as ImageVector
+		} catch (err: Throwable) {
+			logger.error("failed to load icon: $err")
+			null
+		}
+	}
+
+	val modifier = compileStyles(view.styles)
+
+	if (icon == null) Icon(Icons.Rounded.QuestionMark, "no icon", modifier = modifier)
+	else Icon(icon, "${icon.name} icon", modifier = modifier)
+}
diff --git a/app/src/main/java/com/example/objectionapp/view/Image.kt b/app/src/main/java/com/example/objectionapp/view/Image.kt
new file mode 100644
index 0000000..aedd748
--- /dev/null
+++ b/app/src/main/java/com/example/objectionapp/view/Image.kt
@@ -0,0 +1,68 @@
+package com.example.objectionapp.view
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.layout.ContentScale
+import coil.compose.AsyncImage
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonClassDiscriminator
+
+@Serializable
+@SerialName("Image")
+data class ImageView(
+	val styles: List<Style>? = null,
+	val url: String,
+	val description: String,
+	val contentScale: ImageViewContentScale? = null
+) : View()
+
+@OptIn(ExperimentalSerializationApi::class)
+@Serializable
+@JsonClassDiscriminator("$")
+sealed class ImageViewContentScale {
+	@Serializable
+	@SerialName("Fit")
+	data object Fit : ImageViewContentScale()
+
+	@Serializable
+	@SerialName("Crop")
+	data object Crop : ImageViewContentScale()
+
+	@Serializable
+	@SerialName("Inside")
+	data object Inside : ImageViewContentScale()
+
+	@Serializable
+	@SerialName("FillWidth")
+	data object FillWidth : ImageViewContentScale()
+
+	@Serializable
+	@SerialName("FillBounds")
+	data object FillBounds : ImageViewContentScale()
+
+	@Serializable
+	@SerialName("FillHeight")
+	data object FillHeight : ImageViewContentScale()
+
+	fun toContentScale(): ContentScale {
+		return when (this) {
+			is Fit -> ContentScale.Fit
+			is Crop -> ContentScale.Crop
+			is Inside -> ContentScale.Inside
+			is FillWidth -> ContentScale.FillWidth
+			is FillBounds -> ContentScale.FillBounds
+			is FillHeight -> ContentScale.FillHeight
+		}
+	}
+}
+
+@Composable
+fun ImageViewRender(view: ImageView) {
+	AsyncImage(
+		view.url,
+		contentScale = view.contentScale?.toContentScale() ?: ContentScale.Fit,
+		contentDescription = view.description,
+		modifier = compileStyles(view.styles)
+	)
+}
diff --git a/app/src/main/java/com/example/objectionapp/view/Main.kt b/app/src/main/java/com/example/objectionapp/view/Main.kt
new file mode 100644
index 0000000..ecfb892
--- /dev/null
+++ b/app/src/main/java/com/example/objectionapp/view/Main.kt
@@ -0,0 +1,32 @@
+package com.example.objectionapp.view
+
+import androidx.compose.runtime.Composable
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonClassDiscriminator
+
+@OptIn(ExperimentalSerializationApi::class)
+@JsonClassDiscriminator("$")
+@Serializable
+sealed class View
+
+@Composable
+fun ViewRender(view: View) {
+	when (view) {
+		is FloatingBottomSearchBarView -> FloatingBottomSearchBarViewRender(view)
+		is BoxView -> BoxViewRender(view)
+		is ButtonView -> ButtonViewRender(view)
+		is CenterHorizontalView -> CenterHorizontalRender(view)
+		is CenterVerticalView -> CenterVerticalViewRender(view)
+		is RowView -> RowViewRender(view)
+		is ScrollingRowView -> ScrollingRowViewRender(view)
+		is ColumnView -> ColumnViewRender(view)
+		is ScrollingColumnView -> ScrollingColumnViewRender(view)
+		is IconView -> IconViewRender(view)
+		is ImageView -> ImageViewRender(view)
+		is PageToggleView -> PageToggleViewRender(view)
+		is StackView -> StackViewRender(view)
+		is SurfaceView -> SurfaceViewRender(view)
+		is TextView -> TextViewRender(view)
+	}
+}
diff --git a/app/src/main/java/com/example/objectionapp/view/PageToggle.kt b/app/src/main/java/com/example/objectionapp/view/PageToggle.kt
new file mode 100644
index 0000000..a9e37a6
--- /dev/null
+++ b/app/src/main/java/com/example/objectionapp/view/PageToggle.kt
@@ -0,0 +1,87 @@
+package com.example.objectionapp.view
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.navigation.compose.currentBackStackEntryAsState
+import com.example.objectionapp.ContentKey
+import com.example.objectionapp.ObjectReference
+import com.example.objectionapp.Page
+import com.example.objectionapp.decodeObjectIdFromRouteArgs
+import com.example.objectionapp.useNavController
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonClassDiscriminator
+
+@OptIn(ExperimentalSerializationApi::class)
+@Serializable
+@ContentKey("def")
+@JsonClassDiscriminator("$")
+sealed class PageToggleFilter {
+	@Serializable
+	@SerialName("SpecificPage")
+	data class SpecificPage(@ObjectReference(Page::class) val def: String) : PageToggleFilter()
+
+	@Serializable
+	@SerialName("NotSpecificPage")
+	data class NotSpecificPage(@ObjectReference(Page::class) val def: String) : PageToggleFilter()
+
+	fun isOk(pageId: String): Boolean? {
+		return when (this) {
+			is SpecificPage -> {
+				if (pageId == this.def) true
+				else null
+			}
+
+			is NotSpecificPage -> {
+				if (pageId == this.def) false
+				else null
+			}
+		}
+	}
+}
+
+@OptIn(ExperimentalSerializationApi::class)
+@Serializable
+@JsonClassDiscriminator("$")
+sealed class PageToggleViewDefaultBehavior {
+	@Serializable
+	@SerialName("Include")
+	data object Include : PageToggleViewDefaultBehavior()
+
+	@Serializable
+	@SerialName("Exclude")
+	data object Exclude : PageToggleViewDefaultBehavior()
+}
+
+@Serializable
+@SerialName("PageToggle")
+data class PageToggleView(
+	val filters: List<PageToggleFilter>? = null,
+	val content: View? = null,
+	val defaultBehavior: PageToggleViewDefaultBehavior? = null
+) : View()
+
+private fun isFiltersOk(filters: List<PageToggleFilter>, pageId: String): Boolean? {
+	var resolution: Boolean? = null
+
+	for (filter in filters) {
+		resolution = filter.isOk(pageId)
+		if (resolution !== null) return resolution
+	}
+
+	return null
+}
+
+@Composable
+fun PageToggleViewRender(view: PageToggleView) {
+	val controller = useNavController()
+	val stack by controller.currentBackStackEntryAsState()
+	val arguments = stack?.arguments ?: return
+	val objectId = decodeObjectIdFromRouteArgs(arguments)
+	val resolution = isFiltersOk((view.filters ?: listOf()), objectId)
+
+	if (resolution == true || resolution == null && view.defaultBehavior !is PageToggleViewDefaultBehavior.Exclude) {
+		view.content?.let { ViewRender(it) }
+	}
+}
diff --git a/app/src/main/java/com/example/objectionapp/view/Stack.kt b/app/src/main/java/com/example/objectionapp/view/Stack.kt
new file mode 100644
index 0000000..e99a65b
--- /dev/null
+++ b/app/src/main/java/com/example/objectionapp/view/Stack.kt
@@ -0,0 +1,22 @@
+package com.example.objectionapp.view
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.runtime.Composable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+@SerialName("Stack")
+data class StackView(
+	val styles: List<Style>? = null,
+	val items: List<View>? = null,
+) : View()
+
+@Composable
+fun StackViewRender(view: StackView) {
+	Box(modifier = compileStyles(view.styles)) {
+		for (child in view.items ?: listOf()) {
+			ViewRender(child)
+		}
+	}
+}
diff --git a/app/src/main/java/com/example/objectionapp/view/Style.kt b/app/src/main/java/com/example/objectionapp/view/Style.kt
new file mode 100644
index 0000000..a1067da
--- /dev/null
+++ b/app/src/main/java/com/example/objectionapp/view/Style.kt
@@ -0,0 +1,109 @@
+package com.example.objectionapp.view
+
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.unit.dp
+import com.example.objectionapp.ContentKey
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonClassDiscriminator
+
+@OptIn(ExperimentalSerializationApi::class)
+@Serializable
+@JsonClassDiscriminator("$")
+@ContentKey("def")
+sealed class Style {
+	@Serializable
+	@SerialName("Padding")
+	data class Padding(val def: Float) : Style()
+
+	@Serializable
+	@SerialName("PaddingHorizontal")
+	data class PaddingHorizontal(val def: Float) : Style()
+
+	@Serializable
+	@SerialName("PaddingVertical")
+	data class PaddingVertical(val def: Float) : Style()
+
+	@Serializable
+	@SerialName("PaddingTop")
+	data class PaddingTop(val def: Float) : Style()
+
+	@Serializable
+	@SerialName("PaddingBottom")
+	data class PaddingBottom(val def: Float) : Style()
+
+	@Serializable
+	@SerialName("PaddingStart")
+	data class PaddingStart(val def: Float) : Style()
+
+	@Serializable
+	@SerialName("PaddingEnd")
+	data class PaddingEnd(val def: Float) : Style()
+
+	@Serializable
+	@SerialName("ClipCornerRadius")
+	data class ClipCornerRadius(val def: Float) : Style()
+
+	@Serializable
+	@SerialName("Width")
+	data class Width(val def: Float) : Style()
+
+	@Serializable
+	@SerialName("Height")
+	data class Height(val def: Float) : Style()
+
+	@Serializable
+	@SerialName("Size")
+	data class Size(val def: Float) : Style()
+
+	@Serializable
+	@SerialName("FillMaxWidth")
+	data object FillMaxWidth : Style()
+
+	@Serializable
+	@SerialName("FillMaxHeight")
+	data object FillMaxHeight : Style()
+
+	@Serializable
+	@SerialName("FillMaxSize")
+	data object FillMaxSize : Style()
+
+	fun apply(modifier: Modifier): Modifier {
+		return when (this) {
+			is Padding -> modifier.padding(all = def.dp)
+			is PaddingHorizontal -> modifier.padding(horizontal = def.dp)
+			is PaddingVertical -> modifier.padding(vertical = def.dp)
+			is PaddingTop -> modifier.padding(top = def.dp)
+			is PaddingBottom -> modifier.padding(bottom = def.dp)
+			is PaddingStart -> modifier.padding(start = def.dp)
+			is PaddingEnd -> modifier.padding(end = def.dp)
+			is ClipCornerRadius -> modifier.clip(RoundedCornerShape(def.dp))
+			is Width -> modifier.width(def.dp)
+			is Height -> modifier.height(def.dp)
+			is Size -> modifier.size(def.dp)
+			is FillMaxWidth -> modifier.fillMaxWidth()
+			is FillMaxHeight -> modifier.fillMaxHeight()
+			is FillMaxSize -> modifier.fillMaxSize()
+		}
+	}
+}
+
+fun compileStyles(styles: List<Style>?, initialModifier: Modifier = Modifier): Modifier {
+	var modifier = initialModifier
+
+	for (style in styles ?: listOf()) {
+		modifier = style.apply(modifier)
+	}
+
+	return modifier
+}
diff --git a/app/src/main/java/com/example/objectionapp/view/Surface.kt b/app/src/main/java/com/example/objectionapp/view/Surface.kt
new file mode 100644
index 0000000..690f849
--- /dev/null
+++ b/app/src/main/java/com/example/objectionapp/view/Surface.kt
@@ -0,0 +1,54 @@
+package com.example.objectionapp.view
+
+import androidx.compose.foundation.clickable
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.Modifier
+import com.example.objectionapp.Link
+import com.example.objectionapp.useNavController
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+@SerialName("Surface")
+data class SurfaceView(
+	val styles: List<Style>? = null,
+	val link: Link? = null,
+	val intenseColors: Boolean? = null,
+	val color: ThemeColor? = null,
+	val content: View? = null,
+) : View()
+
+@Composable
+fun SurfaceViewRender(view: SurfaceView) {
+	val navController = useNavController()
+
+	// TODO figure out if we should popUp
+
+	val baseModifier = Modifier.clickable {
+		if (view.link != null) view.link.follow(navController, popUp = false)
+	}
+
+	val modifier = compileStyles(view.styles, baseModifier)
+	val color = view.color ?: ThemeColor.Surface
+	val containerColor = color.getContainerColor(view.intenseColors)
+
+	val inner = @Composable {
+		CompositionLocalProvider(LocalContentColor.provides(color.getContentColor(view.intenseColors))) {
+			view.content?.let { ViewRender(it) }
+		}
+	}
+
+	view.link?.let { link ->
+		Surface(
+			modifier = modifier,
+			color = containerColor,
+			onClick = { link.follow(navController, popUp = false) },
+			content = inner
+		)
+	} ?: Surface(
+		modifier = modifier, color = containerColor, content = inner
+	)
+}
diff --git a/app/src/main/java/com/example/objectionapp/view/Text.kt b/app/src/main/java/com/example/objectionapp/view/Text.kt
new file mode 100644
index 0000000..5b4dd41
--- /dev/null
+++ b/app/src/main/java/com/example/objectionapp/view/Text.kt
@@ -0,0 +1,114 @@
+package com.example.objectionapp.view
+
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.sp
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonClassDiscriminator
+
+@OptIn(ExperimentalSerializationApi::class)
+@Serializable
+@JsonClassDiscriminator("$")
+sealed class TextViewWeight {
+	@Serializable
+	data object Light : TextViewWeight()
+
+	@Serializable
+	data object Normal : TextViewWeight()
+
+	@Serializable
+	data object SemiBold : TextViewWeight()
+
+	@Serializable
+	data object Bold : TextViewWeight()
+
+	fun toWeight(): FontWeight {
+		return when (this) {
+			is Light -> FontWeight.Light
+			is Normal -> FontWeight.Normal
+			is SemiBold -> FontWeight.SemiBold
+			is Bold -> FontWeight.Bold
+		}
+	}
+}
+
+@OptIn(ExperimentalSerializationApi::class)
+@Serializable
+@JsonClassDiscriminator("$")
+sealed class TextFont {
+	@Serializable
+	data object SansSerif : TextFont()
+
+	@Serializable
+	data object Serif : TextFont()
+
+	@Serializable
+	data object Monospace : TextFont()
+
+	fun toFontFamily(): FontFamily {
+		return when (this) {
+			is SansSerif -> FontFamily.SansSerif
+			is Serif -> FontFamily.Serif
+			is Monospace -> FontFamily.Monospace
+		}
+	}
+}
+
+@OptIn(ExperimentalSerializationApi::class)
+@Serializable
+@JsonClassDiscriminator("$")
+sealed class TextViewAlign {
+	@Serializable
+	@SerialName("Start")
+	data object Start : TextViewAlign()
+
+	@Serializable
+	@SerialName("End")
+	data object End : TextViewAlign()
+
+	@Serializable
+	@SerialName("Center")
+	data object Center : TextViewAlign()
+
+	@Serializable
+	@SerialName("Justify")
+	data object Justify : TextViewAlign()
+
+	fun toTextAlign(): TextAlign {
+		return when (this) {
+			is Start -> TextAlign.Start
+			is End -> TextAlign.End
+			is Center -> TextAlign.Center
+			is Justify -> TextAlign.Justify
+		}
+	}
+}
+
+@Serializable
+@SerialName("Text")
+data class TextView(
+	val text: String,
+	val size: Float? = null,
+	val weight: TextViewWeight? = null,
+	val font: TextFont? = null,
+	val align: TextViewAlign? = null,
+	val color: ThemeColor? = null,
+) : View()
+
+@Composable
+fun TextViewRender(view: TextView) {
+	Text(
+		view.text,
+		color = view.color?.getContainerColor(intense = false) ?: LocalContentColor.current,
+		fontWeight = (view.weight ?: TextViewWeight.Normal).toWeight(),
+		fontSize = (view.size ?: 16F).toInt().sp,
+		fontFamily = (view.font ?: TextFont.SansSerif).toFontFamily(),
+		textAlign = view.align?.toTextAlign()
+	)
+}
diff --git a/app/src/main/java/com/example/objectionapp/view/ThemeColor.kt b/app/src/main/java/com/example/objectionapp/view/ThemeColor.kt
new file mode 100644
index 0000000..c600f6a
--- /dev/null
+++ b/app/src/main/java/com/example/objectionapp/view/ThemeColor.kt
@@ -0,0 +1,65 @@
+package com.example.objectionapp.view
+
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import com.example.objectionapp.Description
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonClassDiscriminator
+
+@OptIn(ExperimentalSerializationApi::class)
+@Serializable
+@JsonClassDiscriminator("$")
+sealed class ThemeColor {
+	@Description("Does not support color intensity")
+	@Serializable
+	@SerialName("Background")
+	data object Background : ThemeColor()
+
+	@Serializable
+	@SerialName("Primary")
+	data object Primary : ThemeColor()
+
+	@Serializable
+	@SerialName("Secondary")
+	data object Secondary : ThemeColor()
+
+	@Serializable
+	@SerialName("Tertiary")
+	data object Tertiary : ThemeColor()
+
+	@Serializable
+	@SerialName("Surface")
+	data object Surface : ThemeColor()
+
+	@Description("Does not support color intensity")
+	@Serializable
+	@SerialName("Inverse")
+	data object Inverse : ThemeColor()
+
+	@Composable
+	fun getContainerColor(intense: Boolean?): Color {
+		return when (this) {
+			is Background -> MaterialTheme.colorScheme.background
+			is Primary -> if (intense == true) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.primary
+			is Secondary -> if (intense == true) MaterialTheme.colorScheme.secondaryContainer else MaterialTheme.colorScheme.secondary
+			is Tertiary -> if (intense == true) MaterialTheme.colorScheme.tertiaryContainer else MaterialTheme.colorScheme.tertiary
+			is Surface -> if (intense == true) MaterialTheme.colorScheme.surfaceContainer else MaterialTheme.colorScheme.surface
+			is Inverse -> MaterialTheme.colorScheme.inverseSurface
+		}
+	}
+
+	@Composable
+	fun getContentColor(intense: Boolean?): Color {
+		return when (this) {
+			is Background -> MaterialTheme.colorScheme.onBackground
+			is Primary -> if (intense == true) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onPrimary
+			is Secondary -> if (intense == true) MaterialTheme.colorScheme.secondary else MaterialTheme.colorScheme.onSecondary
+			is Tertiary -> if (intense == true) MaterialTheme.colorScheme.tertiary else MaterialTheme.colorScheme.onTertiary
+			is Surface -> if (intense == true) MaterialTheme.colorScheme.surface else MaterialTheme.colorScheme.onSurface
+			is Inverse -> MaterialTheme.colorScheme.inverseOnSurface
+		}
+	}
+}
\ No newline at end of file
diff --git a/objection_deploy.ts b/objection_deploy.ts
index 82a51b8..af12596 100644
--- a/objection_deploy.ts
+++ b/objection_deploy.ts
@@ -50,6 +50,8 @@ const lightBackgroundColor = Color.from(getConfigValue('light_background_color')
 const lightForegroundColor = Color.from(getConfigValue('light_foreground_color'))
 const darkBackgroundColor = Color.from(getConfigValue('dark_background_color'))
 const darkForegroundColor = Color.from(getConfigValue('dark_foreground_color'))
+const lightLoaderColor = Color.from(getConfigValue('light_loader_color'))
+const darkLoaderColor = Color.from(getConfigValue('dark_loader_color'))
 
 await replaceLine('app/src/main/java/com/example/objectionapp/Constants.kt', [
 	{ match: 'const val appName', write: `const val appName = "${appName}"` },
@@ -61,6 +63,8 @@ await replaceLine('app/src/main/java/com/example/objectionapp/Constants.kt', [
 	{ match: 'val lightForegroundColor', write: `val lightForegroundColor = ${lightForegroundColor.toKotlin()}` },
 	{ match: 'val darkBackgroundColor', write: `val darkBackgroundColor = ${darkBackgroundColor.toKotlin()}` },
 	{ match: 'val darkForegroundColor', write: `val darkForegroundColor = ${darkForegroundColor.toKotlin()}` },
+	{ match: 'val lightLoaderColor', write: `val lightLoaderColor = ${lightLoaderColor.toKotlin()}` },
+	{ match: 'val darkLoaderColor', write: `val darkLoaderColor = ${darkLoaderColor.toKotlin()}` },
 ])
 await replaceLine('app/src/main/res/values/colors.xml', [
 	{ match: '<color name="foreground"', write: `<color name="foreground">${lightForegroundColor.toHex()}</color>` },
diff --git a/schema.json b/schema.json
index 50b9420..0e2b2c7 100644
--- a/schema.json
+++ b/schema.json
@@ -1,1987 +1 @@
-{
-	"object": {
-		"$": "type",
-		"name": "com.example.objectionapp.Object"
-	},
-	"types": {
-		"com.example.objectionapp.CardContainer": {
-			"$": "enum",
-			"discriminator_key": "$",
-			"content_key": null,
-			"variants": [
-				{
-					"name": "CustomCardContainer",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "CustomCardContainer"
-					}
-				},
-				{
-					"name": "PluralCardContainer",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "PluralCardContainer"
-					}
-				},
-				{
-					"name": "SingularCardContainer",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "SingularCardContainer"
-					}
-				}
-			]
-		},
-		"com.example.objectionapp.Input": {
-			"$": "enum",
-			"discriminator_key": "$",
-			"content_key": null,
-			"variants": [
-				{
-					"name": "com.example.objectionapp.Input.Switch",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "com.example.objectionapp.Input.Switch"
-					}
-				},
-				{
-					"name": "com.example.objectionapp.Input.Text",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "com.example.objectionapp.Input.Text"
-					}
-				}
-			]
-		},
-		"Page": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "title",
-					"description": "The page title will be displayed prominently at the top of the screen",
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "string"
-						}
-					}
-				},
-				{
-					"name": "subtitle",
-					"description": "The page subtitle is displayed directly under any images on the page",
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "string"
-						}
-					}
-				},
-				{
-					"name": "searchPageId",
-					"description": "The page that will be pulled up for a presumed search through the contents of this page",
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "reference",
-							"expected_top_level_variant": "Page"
-						}
-					}
-				},
-				{
-					"name": "view",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "type",
-							"name": "com.example.objectionapp.View?"
-						}
-					}
-				},
-				{
-					"name": "type",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "com.example.objectionapp.PageType"
-					}
-				}
-			]
-		},
-		"com.example.objectionapp.ContentView.Text.Weight?": {
-			"$": "enum",
-			"discriminator_key": "$",
-			"content_key": null,
-			"variants": [
-				{
-					"name": "Bold",
-					"description": null,
-					"type": null
-				},
-				{
-					"name": "Light",
-					"description": null,
-					"type": null
-				},
-				{
-					"name": "Normal",
-					"description": null,
-					"type": null
-				},
-				{
-					"name": "SemiBold",
-					"description": null,
-					"type": null
-				}
-			]
-		},
-		"Image": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "styles",
-					"description": null,
-					"type": {
-						"$": "list",
-						"item": {
-							"$": "type",
-							"name": "com.example.objectionapp.Style"
-						},
-						"batch_size": 50
-					}
-				},
-				{
-					"name": "url",
-					"description": null,
-					"type": {
-						"$": "string"
-					}
-				},
-				{
-					"name": "description",
-					"description": null,
-					"type": {
-						"$": "string"
-					}
-				}
-			]
-		},
-		"com.example.objectionapp.SubmitStrategy": {
-			"$": "enum",
-			"discriminator_key": "$",
-			"content_key": null,
-			"variants": []
-		},
-		"CustomCardContainer": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "objectId",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "reference",
-							"expected_top_level_variant": "Page"
-						}
-					}
-				},
-				{
-					"name": "title",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "string"
-						}
-					}
-				},
-				{
-					"name": "icon",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "string"
-						}
-					}
-				},
-				{
-					"name": "imageUrl",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "string"
-						}
-					}
-				}
-			]
-		},
-		"ListView": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "items",
-					"description": null,
-					"type": {
-						"$": "list",
-						"item": {
-							"$": "list",
-							"item": {
-								"$": "type",
-								"name": "com.example.objectionapp.ListViewItem"
-							},
-							"batch_size": 50
-						},
-						"batch_size": 50
-					}
-				},
-				{
-					"name": "trailingIcon",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "string"
-						}
-					}
-				}
-			]
-		},
-		"Button": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "link",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "com.example.objectionapp.Link"
-					}
-				},
-				{
-					"name": "styles",
-					"description": null,
-					"type": {
-						"$": "list",
-						"item": {
-							"$": "type",
-							"name": "com.example.objectionapp.Style"
-						},
-						"batch_size": 50
-					}
-				},
-				{
-					"name": "color",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "com.example.objectionapp.ThemeColor"
-					}
-				},
-				{
-					"name": "content",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "com.example.objectionapp.ContentView"
-					}
-				}
-			]
-		},
-		"com.example.objectionapp.Input.Text": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "startingValue",
-					"description": null,
-					"type": {
-						"$": "string"
-					}
-				},
-				{
-					"name": "readOnly",
-					"description": null,
-					"type": {
-						"$": "boolean"
-					}
-				},
-				{
-					"name": "fieldStatus",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "type",
-							"name": "com.example.objectionapp.TextFieldStatus?"
-						}
-					}
-				},
-				{
-					"name": "placeholder",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "string"
-						}
-					}
-				},
-				{
-					"name": "mode",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "com.example.objectionapp.InputMode"
-					}
-				}
-			]
-		},
-		"com.example.objectionapp.FormAction?": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "title",
-					"description": null,
-					"type": {
-						"$": "string"
-					}
-				},
-				{
-					"name": "link",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "type",
-							"name": "com.example.objectionapp.Link?"
-						}
-					}
-				}
-			]
-		},
-		"com.example.objectionapp.InputMode": {
-			"$": "enum",
-			"discriminator_key": "$",
-			"content_key": null,
-			"variants": []
-		},
-		"com.example.objectionapp.ThemeColor?": {
-			"$": "enum",
-			"discriminator_key": "$",
-			"content_key": null,
-			"variants": [
-				{
-					"name": "Inverse",
-					"description": null,
-					"type": null
-				},
-				{
-					"name": "Primary",
-					"description": null,
-					"type": null
-				},
-				{
-					"name": "Secondary",
-					"description": null,
-					"type": null
-				},
-				{
-					"name": "Surface",
-					"description": null,
-					"type": null
-				},
-				{
-					"name": "Tertiary",
-					"description": null,
-					"type": null
-				}
-			]
-		},
-		"com.example.objectionapp.FormActions": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "primaryAction",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "com.example.objectionapp.FormAction"
-					}
-				},
-				{
-					"name": "secondaryAction",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "type",
-							"name": "com.example.objectionapp.FormAction?"
-						}
-					}
-				}
-			]
-		},
-		"PluralCardContainer": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "objectIds",
-					"description": null,
-					"type": {
-						"$": "list",
-						"item": {
-							"$": "reference",
-							"expected_top_level_variant": "Page"
-						},
-						"batch_size": 50
-					}
-				},
-				{
-					"name": "title",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "string"
-						}
-					}
-				}
-			]
-		},
-		"com.example.objectionapp.TabBar?": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "floating",
-					"description": null,
-					"type": {
-						"$": "boolean"
-					}
-				},
-				{
-					"name": "pages",
-					"description": null,
-					"type": {
-						"$": "list",
-						"item": {
-							"$": "reference",
-							"expected_top_level_variant": "Page"
-						},
-						"batch_size": 50
-					}
-				},
-				{
-					"name": "searchEmbedStrategy",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "type",
-							"name": "com.example.objectionapp.SearchEmbedStrategy?"
-						}
-					}
-				}
-			]
-		},
-		"CardView": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "options",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "com.example.objectionapp.CardViewOptions"
-					}
-				},
-				{
-					"name": "containers",
-					"description": null,
-					"type": {
-						"$": "list",
-						"item": {
-							"$": "type",
-							"name": "com.example.objectionapp.CardContainer"
-						},
-						"batch_size": 50
-					}
-				}
-			]
-		},
-		"com.example.objectionapp.Input.Switch": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "switched",
-					"description": null,
-					"type": {
-						"$": "boolean"
-					}
-				}
-			]
-		},
-		"Box": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "color",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "type",
-							"name": "com.example.objectionapp.ThemeColor?"
-						}
-					}
-				},
-				{
-					"name": "styles",
-					"description": null,
-					"type": {
-						"$": "list",
-						"item": {
-							"$": "type",
-							"name": "com.example.objectionapp.Style"
-						},
-						"batch_size": 50
-					}
-				},
-				{
-					"name": "items",
-					"description": null,
-					"type": {
-						"$": "list",
-						"item": {
-							"$": "type",
-							"name": "com.example.objectionapp.ContentView"
-						},
-						"batch_size": 50
-					}
-				}
-			]
-		},
-		"Card": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "styles",
-					"description": null,
-					"type": {
-						"$": "list",
-						"item": {
-							"$": "type",
-							"name": "com.example.objectionapp.Style"
-						},
-						"batch_size": 50
-					}
-				},
-				{
-					"name": "link",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "type",
-							"name": "com.example.objectionapp.Link?"
-						}
-					}
-				},
-				{
-					"name": "color",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "com.example.objectionapp.ThemeColor"
-					}
-				},
-				{
-					"name": "content",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "com.example.objectionapp.ContentView"
-					}
-				}
-			]
-		},
-		"ScrollingRow": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "styles",
-					"description": null,
-					"type": {
-						"$": "list",
-						"item": {
-							"$": "type",
-							"name": "com.example.objectionapp.Style"
-						},
-						"batch_size": 50
-					}
-				},
-				{
-					"name": "spacing",
-					"description": null,
-					"type": {
-						"$": "number"
-					}
-				},
-				{
-					"name": "items",
-					"description": null,
-					"type": {
-						"$": "list",
-						"item": {
-							"$": "type",
-							"name": "com.example.objectionapp.ContentView"
-						},
-						"batch_size": 50
-					}
-				}
-			]
-		},
-		"com.example.objectionapp.Style": {
-			"$": "enum",
-			"discriminator_key": "$",
-			"content_key": "def",
-			"variants": [
-				{
-					"name": "ClipCornerRadius",
-					"description": null,
-					"type": {
-						"$": "number"
-					}
-				},
-				{
-					"name": "FillMaxHeight",
-					"description": null,
-					"type": null
-				},
-				{
-					"name": "FillMaxSize",
-					"description": null,
-					"type": null
-				},
-				{
-					"name": "FillMaxWidth",
-					"description": null,
-					"type": null
-				},
-				{
-					"name": "Height",
-					"description": null,
-					"type": {
-						"$": "number"
-					}
-				},
-				{
-					"name": "PaddingBottom",
-					"description": null,
-					"type": {
-						"$": "number"
-					}
-				},
-				{
-					"name": "PaddingEnd",
-					"description": null,
-					"type": {
-						"$": "number"
-					}
-				},
-				{
-					"name": "Padding",
-					"description": null,
-					"type": {
-						"$": "number"
-					}
-				},
-				{
-					"name": "PaddingStart",
-					"description": null,
-					"type": {
-						"$": "number"
-					}
-				},
-				{
-					"name": "PaddingTop",
-					"description": null,
-					"type": {
-						"$": "number"
-					}
-				},
-				{
-					"name": "PaddingVertical",
-					"description": null,
-					"type": {
-						"$": "number"
-					}
-				},
-				{
-					"name": "Size",
-					"description": null,
-					"type": {
-						"$": "number"
-					}
-				},
-				{
-					"name": "Width",
-					"description": null,
-					"type": {
-						"$": "number"
-					}
-				}
-			]
-		},
-		"Plain": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "icon",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "string"
-						}
-					}
-				}
-			]
-		},
-		"com.example.objectionapp.ThemeColor": {
-			"$": "enum",
-			"discriminator_key": "$",
-			"content_key": null,
-			"variants": [
-				{
-					"name": "Inverse",
-					"description": null,
-					"type": null
-				},
-				{
-					"name": "Primary",
-					"description": null,
-					"type": null
-				},
-				{
-					"name": "Secondary",
-					"description": null,
-					"type": null
-				},
-				{
-					"name": "Surface",
-					"description": null,
-					"type": null
-				},
-				{
-					"name": "Tertiary",
-					"description": null,
-					"type": null
-				}
-			]
-		},
-		"com.example.objectionapp.Link?": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "pageId",
-					"description": null,
-					"type": {
-						"$": "reference",
-						"expected_top_level_variant": "Page"
-					}
-				},
-				{
-					"name": "useSheet",
-					"description": null,
-					"type": {
-						"$": "boolean"
-					}
-				}
-			]
-		},
-		"Row": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "styles",
-					"description": null,
-					"type": {
-						"$": "list",
-						"item": {
-							"$": "type",
-							"name": "com.example.objectionapp.Style"
-						},
-						"batch_size": 50
-					}
-				},
-				{
-					"name": "spacing",
-					"description": null,
-					"type": {
-						"$": "number"
-					}
-				},
-				{
-					"name": "items",
-					"description": null,
-					"type": {
-						"$": "list",
-						"item": {
-							"$": "type",
-							"name": "com.example.objectionapp.ContentView.Row.Item"
-						},
-						"batch_size": 50
-					}
-				}
-			]
-		},
-		"FormView": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "items",
-					"description": null,
-					"type": {
-						"$": "list",
-						"item": {
-							"$": "type",
-							"name": "com.example.objectionapp.FormItem"
-						},
-						"batch_size": 50
-					}
-				},
-				{
-					"name": "actionStyle",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "com.example.objectionapp.FormActionStyle"
-					}
-				},
-				{
-					"name": "actions",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "com.example.objectionapp.FormActions"
-					}
-				}
-			]
-		},
-		"com.example.objectionapp.ContentView": {
-			"$": "enum",
-			"discriminator_key": "$",
-			"content_key": null,
-			"variants": [
-				{
-					"name": "Box",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "Box"
-					}
-				},
-				{
-					"name": "Button",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "Button"
-					}
-				},
-				{
-					"name": "Card",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "Card"
-					}
-				},
-				{
-					"name": "Center",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "Center"
-					}
-				},
-				{
-					"name": "Column",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "Column"
-					}
-				},
-				{
-					"name": "Image",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "Image"
-					}
-				},
-				{
-					"name": "Row",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "Row"
-					}
-				},
-				{
-					"name": "ScrollingColumn",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "ScrollingColumn"
-					}
-				},
-				{
-					"name": "ScrollingRow",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "ScrollingRow"
-					}
-				},
-				{
-					"name": "Paragraph",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "Paragraph"
-					}
-				}
-			]
-		},
-		"com.example.objectionapp.ListViewItem": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "pageId",
-					"description": null,
-					"type": {
-						"$": "string"
-					}
-				}
-			]
-		},
-		"Profile": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "bannerImageUrl",
-					"description": "The the banner image for the user profile",
-					"type": {
-						"$": "string"
-					}
-				},
-				{
-					"name": "avatarImageUrl",
-					"description": "The avatar image for the user profile",
-					"type": {
-						"$": "string"
-					}
-				}
-			]
-		},
-		"com.example.objectionapp.PageType": {
-			"$": "enum",
-			"discriminator_key": "$",
-			"content_key": null,
-			"variants": [
-				{
-					"name": "Plain",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "Plain"
-					}
-				},
-				{
-					"name": "Post",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "Post"
-					}
-				},
-				{
-					"name": "Profile",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "Profile"
-					}
-				}
-			]
-		},
-		"com.example.objectionapp.SearchEmbedStrategy?": {
-			"$": "enum",
-			"discriminator_key": "$",
-			"content_key": null,
-			"variants": [
-				{
-					"name": "page",
-					"description": null,
-					"type": null
-				},
-				{
-					"name": "sheet",
-					"description": null,
-					"type": null
-				}
-			]
-		},
-		"com.example.objectionapp.FormActionStyle": {
-			"$": "enum",
-			"discriminator_key": "$",
-			"content_key": null,
-			"variants": []
-		},
-		"SingularCardContainer": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "objectId",
-					"description": null,
-					"type": {
-						"$": "reference",
-						"expected_top_level_variant": "Page"
-					}
-				}
-			]
-		},
-		"com.example.objectionapp.FormAction": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "title",
-					"description": null,
-					"type": {
-						"$": "string"
-					}
-				},
-				{
-					"name": "link",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "type",
-							"name": "com.example.objectionapp.Link?"
-						}
-					}
-				}
-			]
-		},
-		"Column": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "styles",
-					"description": null,
-					"type": {
-						"$": "list",
-						"item": {
-							"$": "type",
-							"name": "com.example.objectionapp.Style"
-						},
-						"batch_size": 50
-					}
-				},
-				{
-					"name": "spacing",
-					"description": null,
-					"type": {
-						"$": "number"
-					}
-				},
-				{
-					"name": "items",
-					"description": null,
-					"type": {
-						"$": "list",
-						"item": {
-							"$": "type",
-							"name": "com.example.objectionapp.ContentView.Column.Item"
-						},
-						"batch_size": 50
-					}
-				}
-			]
-		},
-		"com.example.objectionapp.Object": {
-			"$": "enum",
-			"discriminator_key": "$",
-			"content_key": null,
-			"variants": [
-				{
-					"name": "Layout",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "Layout"
-					}
-				},
-				{
-					"name": "Page",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "Page"
-					}
-				},
-				{
-					"name": "Theme",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "Theme"
-					}
-				}
-			]
-		},
-		"com.example.objectionapp.Link": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "pageId",
-					"description": null,
-					"type": {
-						"$": "reference",
-						"expected_top_level_variant": "Page"
-					}
-				},
-				{
-					"name": "useSheet",
-					"description": null,
-					"type": {
-						"$": "boolean"
-					}
-				}
-			]
-		},
-		"ScrollingColumn": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "styles",
-					"description": null,
-					"type": {
-						"$": "list",
-						"item": {
-							"$": "type",
-							"name": "com.example.objectionapp.Style"
-						},
-						"batch_size": 50
-					}
-				},
-				{
-					"name": "spacing",
-					"description": null,
-					"type": {
-						"$": "number"
-					}
-				},
-				{
-					"name": "items",
-					"description": null,
-					"type": {
-						"$": "list",
-						"item": {
-							"$": "type",
-							"name": "com.example.objectionapp.ContentView"
-						},
-						"batch_size": 50
-					}
-				}
-			]
-		},
-		"com.example.objectionapp.IconPack": {
-			"$": "enum",
-			"discriminator_key": "$",
-			"content_key": null,
-			"variants": [
-				{
-					"name": "filled",
-					"description": null,
-					"type": null
-				},
-				{
-					"name": "rounded",
-					"description": null,
-					"type": null
-				},
-				{
-					"name": "sharp",
-					"description": null,
-					"type": null
-				}
-			]
-		},
-		"com.example.objectionapp.ColorScheme": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "primary",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "onPrimary",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "primaryContainer",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "onPrimaryContainer",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "inversePrimary",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "secondary",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "onSecondary",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "secondaryContainer",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "onSecondaryContainer",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "tertiary",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "onTertiary",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "tertiaryContainer",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "onTertiaryContainer",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "background",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "onBackground",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "surface",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "onSurface",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "surfaceVariant",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "onSurfaceVariant",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "surfaceTint",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "inverseSurface",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "inverseOnSurface",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "error",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "onError",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "errorContainer",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "onErrorContainer",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "outline",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "outlineVariant",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "scrim",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "surfaceBright",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "surfaceContainer",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "surfaceContainerHigh",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "surfaceContainerHighest",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "surfaceContainerLow",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "surfaceContainerLowest",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				},
-				{
-					"name": "surfaceDim",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "color"
-						}
-					}
-				}
-			]
-		},
-		"com.example.objectionapp.FormItem": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "submitStrategy",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "com.example.objectionapp.SubmitStrategy"
-					}
-				},
-				{
-					"name": "label",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "string"
-						}
-					}
-				},
-				{
-					"name": "description",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "string"
-						}
-					}
-				},
-				{
-					"name": "input",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "com.example.objectionapp.Input"
-					}
-				}
-			]
-		},
-		"Center": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "styles",
-					"description": null,
-					"type": {
-						"$": "list",
-						"item": {
-							"$": "type",
-							"name": "com.example.objectionapp.Style"
-						},
-						"batch_size": 50
-					}
-				},
-				{
-					"name": "content",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "com.example.objectionapp.ContentView"
-					}
-				}
-			]
-		},
-		"Post": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "imageUrls",
-					"description": "The images will be displayed in carousel form, directly below the title",
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "list",
-							"item": {
-								"$": "string"
-							},
-							"batch_size": 50
-						}
-					}
-				},
-				{
-					"name": "supertitle",
-					"description": "The page supertitle is displayed directly below any images on the page",
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "string"
-						}
-					}
-				},
-				{
-					"name": "additionalInfo",
-					"description": "The additional info is displayed directly below any images on the page",
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "string"
-						}
-					}
-				}
-			]
-		},
-		"com.example.objectionapp.ContentView.Column.Item": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "expand",
-					"description": null,
-					"type": {
-						"$": "boolean"
-					}
-				},
-				{
-					"name": "content",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "com.example.objectionapp.ContentView"
-					}
-				}
-			]
-		},
-		"com.example.objectionapp.CardViewOptions": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "excessiveRounding",
-					"description": null,
-					"type": {
-						"$": "boolean"
-					}
-				},
-				{
-					"name": "useCardPadding",
-					"description": null,
-					"type": {
-						"$": "boolean"
-					}
-				}
-			]
-		},
-		"Paragraph": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "text",
-					"description": null,
-					"type": {
-						"$": "string"
-					}
-				},
-				{
-					"name": "size",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "number"
-						}
-					}
-				},
-				{
-					"name": "weight",
-					"description": null,
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "type",
-							"name": "com.example.objectionapp.ContentView.Text.Weight?"
-						}
-					}
-				}
-			]
-		},
-		"Layout": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "tabBar",
-					"description": "The tab bar is shown at the bottom of the application. If there is no current page set, the current page will default to the first tab bar item.",
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "type",
-							"name": "com.example.objectionapp.TabBar?"
-						}
-					}
-				},
-				{
-					"name": "currentPageId",
-					"description": "The page that is to be shown by default",
-					"type": {
-						"$": "optional",
-						"child": {
-							"$": "reference",
-							"expected_top_level_variant": "Page"
-						}
-					}
-				}
-			]
-		},
-		"com.example.objectionapp.View?": {
-			"$": "enum",
-			"discriminator_key": "$",
-			"content_key": null,
-			"variants": [
-				{
-					"name": "CardView",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "CardView"
-					}
-				},
-				{
-					"name": "Box",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "Box"
-					}
-				},
-				{
-					"name": "Button",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "Button"
-					}
-				},
-				{
-					"name": "Card",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "Card"
-					}
-				},
-				{
-					"name": "Center",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "Center"
-					}
-				},
-				{
-					"name": "Column",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "Column"
-					}
-				},
-				{
-					"name": "Image",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "Image"
-					}
-				},
-				{
-					"name": "Row",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "Row"
-					}
-				},
-				{
-					"name": "ScrollingColumn",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "ScrollingColumn"
-					}
-				},
-				{
-					"name": "ScrollingRow",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "ScrollingRow"
-					}
-				},
-				{
-					"name": "Paragraph",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "Paragraph"
-					}
-				},
-				{
-					"name": "FormView",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "FormView"
-					}
-				},
-				{
-					"name": "ListView",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "ListView"
-					}
-				}
-			]
-		},
-		"com.example.objectionapp.TextFieldStatus?": {
-			"$": "enum",
-			"discriminator_key": "$",
-			"content_key": null,
-			"variants": []
-		},
-		"Theme": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "disableDynamicTheme",
-					"description": "Unless otherwise specified, the supplied light and dark color schemes will be overridden with the android-supplied color scheme, which is computed from the home screen background.",
-					"type": {
-						"$": "boolean"
-					}
-				},
-				{
-					"name": "lightColorScheme",
-					"description": "The color scheme that will be applied when the system is in light mode, when the dynamic theme is disabled",
-					"type": {
-						"$": "type",
-						"name": "com.example.objectionapp.ColorScheme"
-					}
-				},
-				{
-					"name": "darkColorScheme",
-					"description": "The color scheme that will be applied when the system is in dark mode, when the dynamic theme is disabled",
-					"type": {
-						"$": "type",
-						"name": "com.example.objectionapp.ColorScheme"
-					}
-				},
-				{
-					"name": "iconPack",
-					"description": "The type of icons that will be displayed in other parts of the app",
-					"type": {
-						"$": "type",
-						"name": "com.example.objectionapp.IconPack"
-					}
-				}
-			]
-		},
-		"com.example.objectionapp.ContentView.Row.Item": {
-			"$": "struct",
-			"properties": [
-				{
-					"name": "expand",
-					"description": null,
-					"type": {
-						"$": "boolean"
-					}
-				},
-				{
-					"name": "content",
-					"description": null,
-					"type": {
-						"$": "type",
-						"name": "com.example.objectionapp.ContentView"
-					}
-				}
-			]
-		}
-	},
-	"version": "0.1",
-	"initial_objects": [
-		{
-			"id": "theme_default",
-			"description": "The theme that will be applied by default to all UI elements",
-			"expected_top_level_variant": null
-		},
-		{
-			"id": "layout_default",
-			"description": "The layout that will wrap everything",
-			"expected_top_level_variant": null
-		}
-	]
-}
\ No newline at end of file
+{"object":{"$":"type","name":"com.example.objectionapp.Object"},"types":{"com.example.objectionapp.view.TabBar?":{"$":"struct","properties":[{"name":"floating","description":null,"type":{"$":"boolean"}},{"name":"buttons","description":null,"type":{"$":"list","item":{"$":"type","name":"com.example.objectionapp.view.TabBarButton"},"batch_size":50}},{"name":"searchView","description":null,"type":{"$":"optional","child":{"$":"type","name":"com.example.objectionapp.view.View?"}}}]},"Page":{"$":"struct","properties":[{"name":"view","description":null,"type":{"$":"optional","child":{"$":"type","name":"com.example.objectionapp.view.View?"}}}]},"Image":{"$":"struct","properties":[{"name":"styles","description":null,"type":{"$":"optional","child":{"$":"list","item":{"$":"type","name":"com.example.objectionapp.view.Style"},"batch_size":50}}},{"name":"url","description":null,"type":{"$":"string"}},{"name":"description","description":null,"type":{"$":"string"}},{"name":"contentScale","description":null,"type":{"$":"optional","child":{"$":"type","name":"com.example.objectionapp.view.ImageViewContentScale?"}}}]},"com.example.objectionapp.view.ThemeColor?":{"$":"enum","discriminator_key":"$","content_key":null,"variants":[{"name":"Background","description":null,"type":null},{"name":"Inverse","description":null,"type":null},{"name":"Primary","description":null,"type":null},{"name":"Secondary","description":null,"type":null},{"name":"Surface","description":null,"type":null},{"name":"Tertiary","description":null,"type":null}]},"Surface":{"$":"struct","properties":[{"name":"styles","description":null,"type":{"$":"optional","child":{"$":"list","item":{"$":"type","name":"com.example.objectionapp.view.Style"},"batch_size":50}}},{"name":"link","description":null,"type":{"$":"optional","child":{"$":"type","name":"com.example.objectionapp.Link?"}}},{"name":"intenseColors","description":null,"type":{"$":"optional","child":{"$":"boolean"}}},{"name":"color","description":null,"type":{"$":"optional","child":{"$":"type","name":"com.example.objectionapp.view.ThemeColor?"}}},{"name":"content","description":null,"type":{"$":"optional","child":{"$":"type","name":"com.example.objectionapp.view.View?"}}}]},"PageToggle":{"$":"struct","properties":[{"name":"filters","description":null,"type":{"$":"optional","child":{"$":"list","item":{"$":"type","name":"com.example.objectionapp.view.PageToggleFilter"},"batch_size":50}}},{"name":"content","description":null,"type":{"$":"optional","child":{"$":"type","name":"com.example.objectionapp.view.View?"}}},{"name":"defaultBehavior","description":null,"type":{"$":"optional","child":{"$":"type","name":"com.example.objectionapp.view.PageToggleViewDefaultBehavior?"}}}]},"com.example.objectionapp.view.VerticalAlignment?":{"$":"enum","discriminator_key":"$","content_key":null,"variants":[{"name":"com.example.objectionapp.view.VerticalAlignment.Bottom","description":null,"type":null},{"name":"com.example.objectionapp.view.VerticalAlignment.Center","description":null,"type":null},{"name":"com.example.objectionapp.view.VerticalAlignment.Top","description":null,"type":null}]},"FloatingBottomSearchBar":{"$":"struct","properties":[{"name":"icon","description":null,"type":{"$":"string"}},{"name":"text","description":null,"type":{"$":"string"}},{"name":"link","description":null,"type":{"$":"type","name":"com.example.objectionapp.Link"}}]},"Button":{"$":"struct","properties":[{"name":"link","description":null,"type":{"$":"type","name":"com.example.objectionapp.Link"}},{"name":"content","description":null,"type":{"$":"optional","child":{"$":"type","name":"com.example.objectionapp.view.View?"}}},{"name":"styles","description":null,"type":{"$":"optional","child":{"$":"list","item":{"$":"type","name":"com.example.objectionapp.view.Style"},"batch_size":50}}},{"name":"color","description":null,"type":{"$":"optional","child":{"$":"type","name":"com.example.objectionapp.view.ThemeColor?"}}},{"name":"intenseColor","description":null,"type":{"$":"optional","child":{"$":"boolean"}}}]},"Column":{"$":"struct","properties":[{"name":"styles","description":null,"type":{"$":"optional","child":{"$":"list","item":{"$":"type","name":"com.example.objectionapp.view.Style"},"batch_size":50}}},{"name":"spacing","description":null,"type":{"$":"optional","child":{"$":"number"}}},{"name":"items","description":null,"type":{"$":"optional","child":{"$":"list","item":{"$":"type","name":"com.example.objectionapp.view.FlexItem"},"batch_size":50}}},{"name":"alignment","description":null,"type":{"$":"optional","child":{"$":"type","name":"com.example.objectionapp.view.HorizontalAlignment?"}}}]},"com.example.objectionapp.view.PageToggleViewDefaultBehavior?":{"$":"enum","discriminator_key":"$","content_key":null,"variants":[{"name":"Exclude","description":null,"type":null},{"name":"Include","description":null,"type":null}]},"com.example.objectionapp.view.TextViewAlign?":{"$":"enum","discriminator_key":"$","content_key":null,"variants":[{"name":"Center","description":null,"type":null},{"name":"End","description":null,"type":null},{"name":"Justify","description":null,"type":null},{"name":"Start","description":null,"type":null}]},"com.example.objectionapp.view.ContentPadding":{"$":"enum","discriminator_key":"$","content_key":"def","variants":[{"name":"Padding","description":null,"type":{"$":"number"}},{"name":"Bottom","description":null,"type":{"$":"number"}},{"name":"End","description":null,"type":{"$":"number"}},{"name":"Horizontal","description":null,"type":{"$":"number"}},{"name":"Start","description":null,"type":{"$":"number"}},{"name":"Top","description":null,"type":{"$":"number"}},{"name":"Vertical","description":null,"type":{"$":"number"}}]},"com.example.objectionapp.Object":{"$":"enum","discriminator_key":"$","content_key":null,"variants":[{"name":"Layout","description":null,"type":{"$":"type","name":"Layout"}},{"name":"Page","description":null,"type":{"$":"type","name":"Page"}},{"name":"Theme","description":null,"type":{"$":"type","name":"Theme"}}]},"com.example.objectionapp.view.Style":{"$":"enum","discriminator_key":"$","content_key":"def","variants":[{"name":"ClipCornerRadius","description":null,"type":{"$":"number"}},{"name":"FillMaxHeight","description":null,"type":null},{"name":"FillMaxSize","description":null,"type":null},{"name":"FillMaxWidth","description":null,"type":null},{"name":"Height","description":null,"type":{"$":"number"}},{"name":"Padding","description":null,"type":{"$":"number"}},{"name":"PaddingBottom","description":null,"type":{"$":"number"}},{"name":"PaddingEnd","description":null,"type":{"$":"number"}},{"name":"PaddingHorizontal","description":null,"type":{"$":"number"}},{"name":"PaddingStart","description":null,"type":{"$":"number"}},{"name":"PaddingTop","description":null,"type":{"$":"number"}},{"name":"PaddingVertical","description":null,"type":{"$":"number"}},{"name":"Size","description":null,"type":{"$":"number"}},{"name":"Width","description":null,"type":{"$":"number"}}]},"com.example.objectionapp.Link":{"$":"struct","properties":[{"name":"pageId","description":null,"type":{"$":"reference","expected_top_level_variant":"Page"}},{"name":"useSheet","description":null,"type":{"$":"optional","child":{"$":"boolean"}}}]},"ScrollingColumn":{"$":"struct","properties":[{"name":"styles","description":null,"type":{"$":"optional","child":{"$":"list","item":{"$":"type","name":"com.example.objectionapp.view.Style"},"batch_size":50}}},{"name":"spacing","description":null,"type":{"$":"optional","child":{"$":"number"}}},{"name":"items","description":null,"type":{"$":"optional","child":{"$":"list","item":{"$":"type","name":"com.example.objectionapp.view.View"},"batch_size":50}}},{"name":"contentPadding","description":null,"type":{"$":"optional","child":{"$":"list","item":{"$":"type","name":"com.example.objectionapp.view.ContentPadding"},"batch_size":50}}}]},"com.example.objectionapp.IconPack":{"$":"enum","discriminator_key":"$","content_key":null,"variants":[{"name":"filled","description":null,"type":null},{"name":"rounded","description":null,"type":null},{"name":"sharp","description":null,"type":null}]},"com.example.objectionapp.ColorScheme":{"$":"struct","properties":[{"name":"primary","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"onPrimary","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"primaryContainer","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"onPrimaryContainer","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"inversePrimary","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"secondary","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"onSecondary","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"secondaryContainer","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"onSecondaryContainer","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"tertiary","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"onTertiary","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"tertiaryContainer","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"onTertiaryContainer","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"background","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"onBackground","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"surface","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"onSurface","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"surfaceVariant","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"onSurfaceVariant","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"surfaceTint","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"inverseSurface","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"inverseOnSurface","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"error","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"onError","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"errorContainer","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"onErrorContainer","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"outline","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"outlineVariant","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"scrim","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"surfaceBright","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"surfaceContainer","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"surfaceContainerHigh","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"surfaceContainerHighest","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"surfaceContainerLow","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"surfaceContainerLowest","description":null,"type":{"$":"optional","child":{"$":"color"}}},{"name":"surfaceDim","description":null,"type":{"$":"optional","child":{"$":"color"}}}]},"com.example.objectionapp.view.PageToggleFilter":{"$":"enum","discriminator_key":"$","content_key":"def","variants":[{"name":"NotSpecificPage","description":null,"type":{"$":"reference","expected_top_level_variant":"Page"}},{"name":"SpecificPage","description":null,"type":{"$":"reference","expected_top_level_variant":"Page"}}]},"com.example.objectionapp.view.View":{"$":"enum","discriminator_key":"$","content_key":null,"variants":[{"name":"Box","description":null,"type":{"$":"type","name":"Box"}},{"name":"Button","description":null,"type":{"$":"type","name":"Button"}},{"name":"CenterHorizontally","description":null,"type":{"$":"type","name":"CenterHorizontally"}},{"name":"CenterVertically","description":null,"type":{"$":"type","name":"CenterVertically"}},{"name":"Column","description":null,"type":{"$":"type","name":"Column"}},{"name":"FloatingBottomSearchBar","description":null,"type":{"$":"type","name":"FloatingBottomSearchBar"}},{"name":"Icon","description":null,"type":{"$":"type","name":"Icon"}},{"name":"Image","description":null,"type":{"$":"type","name":"Image"}},{"name":"PageToggle","description":null,"type":{"$":"type","name":"PageToggle"}},{"name":"Row","description":null,"type":{"$":"type","name":"Row"}},{"name":"ScrollingColumn","description":null,"type":{"$":"type","name":"ScrollingColumn"}},{"name":"ScrollingRow","description":null,"type":{"$":"type","name":"ScrollingRow"}},{"name":"Stack","description":null,"type":{"$":"type","name":"Stack"}},{"name":"Surface","description":null,"type":{"$":"type","name":"Surface"}},{"name":"Text","description":null,"type":{"$":"type","name":"Text"}}]},"com.example.objectionapp.view.View?":{"$":"enum","discriminator_key":"$","content_key":null,"variants":[{"name":"Box","description":null,"type":{"$":"type","name":"Box"}},{"name":"Button","description":null,"type":{"$":"type","name":"Button"}},{"name":"CenterHorizontally","description":null,"type":{"$":"type","name":"CenterHorizontally"}},{"name":"CenterVertically","description":null,"type":{"$":"type","name":"CenterVertically"}},{"name":"Column","description":null,"type":{"$":"type","name":"Column"}},{"name":"FloatingBottomSearchBar","description":null,"type":{"$":"type","name":"FloatingBottomSearchBar"}},{"name":"Icon","description":null,"type":{"$":"type","name":"Icon"}},{"name":"Image","description":null,"type":{"$":"type","name":"Image"}},{"name":"PageToggle","description":null,"type":{"$":"type","name":"PageToggle"}},{"name":"Row","description":null,"type":{"$":"type","name":"Row"}},{"name":"ScrollingColumn","description":null,"type":{"$":"type","name":"ScrollingColumn"}},{"name":"ScrollingRow","description":null,"type":{"$":"type","name":"ScrollingRow"}},{"name":"Stack","description":null,"type":{"$":"type","name":"Stack"}},{"name":"Surface","description":null,"type":{"$":"type","name":"Surface"}},{"name":"Text","description":null,"type":{"$":"type","name":"Text"}}]},"Box":{"$":"struct","properties":[{"name":"color","description":null,"type":{"$":"optional","child":{"$":"type","name":"com.example.objectionapp.view.ThemeColor?"}}},{"name":"intenseColor","description":null,"type":{"$":"optional","child":{"$":"boolean"}}},{"name":"styles","description":null,"type":{"$":"optional","child":{"$":"list","item":{"$":"type","name":"com.example.objectionapp.view.Style"},"batch_size":50}}},{"name":"content","description":null,"type":{"$":"optional","child":{"$":"type","name":"com.example.objectionapp.view.View?"}}}]},"Text":{"$":"struct","properties":[{"name":"text","description":null,"type":{"$":"string"}},{"name":"size","description":null,"type":{"$":"optional","child":{"$":"number"}}},{"name":"weight","description":null,"type":{"$":"optional","child":{"$":"type","name":"com.example.objectionapp.view.TextViewWeight?"}}},{"name":"font","description":null,"type":{"$":"optional","child":{"$":"type","name":"com.example.objectionapp.view.TextFont?"}}},{"name":"align","description":null,"type":{"$":"optional","child":{"$":"type","name":"com.example.objectionapp.view.TextViewAlign?"}}},{"name":"color","description":null,"type":{"$":"optional","child":{"$":"type","name":"com.example.objectionapp.view.ThemeColor?"}}}]},"com.example.objectionapp.view.HorizontalAlignment?":{"$":"enum","discriminator_key":"$","content_key":null,"variants":[{"name":"com.example.objectionapp.view.HorizontalAlignment.Center","description":null,"type":null},{"name":"com.example.objectionapp.view.HorizontalAlignment.End","description":null,"type":null},{"name":"com.example.objectionapp.view.HorizontalAlignment.Start","description":null,"type":null}]},"Stack":{"$":"struct","properties":[{"name":"styles","description":null,"type":{"$":"optional","child":{"$":"list","item":{"$":"type","name":"com.example.objectionapp.view.Style"},"batch_size":50}}},{"name":"items","description":null,"type":{"$":"optional","child":{"$":"list","item":{"$":"type","name":"com.example.objectionapp.view.View"},"batch_size":50}}}]},"com.example.objectionapp.view.TextFont?":{"$":"enum","discriminator_key":"$","content_key":null,"variants":[{"name":"com.example.objectionapp.view.TextFont.Monospace","description":null,"type":null},{"name":"com.example.objectionapp.view.TextFont.SansSerif","description":null,"type":null},{"name":"com.example.objectionapp.view.TextFont.Serif","description":null,"type":null}]},"com.example.objectionapp.view.TabBarButton":{"$":"struct","properties":[{"name":"pageId","description":null,"type":{"$":"reference","expected_top_level_variant":"Page"}},{"name":"text","description":null,"type":{"$":"string"}},{"name":"icon","description":null,"type":{"$":"string"}}]},"ScrollingRow":{"$":"struct","properties":[{"name":"styles","description":null,"type":{"$":"optional","child":{"$":"list","item":{"$":"type","name":"com.example.objectionapp.view.Style"},"batch_size":50}}},{"name":"spacing","description":null,"type":{"$":"optional","child":{"$":"number"}}},{"name":"items","description":null,"type":{"$":"optional","child":{"$":"list","item":{"$":"type","name":"com.example.objectionapp.view.View"},"batch_size":50}}},{"name":"contentPadding","description":null,"type":{"$":"optional","child":{"$":"list","item":{"$":"type","name":"com.example.objectionapp.view.ContentPadding"},"batch_size":50}}}]},"com.example.objectionapp.view.TextViewWeight?":{"$":"enum","discriminator_key":"$","content_key":null,"variants":[{"name":"com.example.objectionapp.view.TextViewWeight.Bold","description":null,"type":null},{"name":"com.example.objectionapp.view.TextViewWeight.Light","description":null,"type":null},{"name":"com.example.objectionapp.view.TextViewWeight.Normal","description":null,"type":null},{"name":"com.example.objectionapp.view.TextViewWeight.SemiBold","description":null,"type":null}]},"CenterVertically":{"$":"struct","properties":[{"name":"styles","description":null,"type":{"$":"optional","child":{"$":"list","item":{"$":"type","name":"com.example.objectionapp.view.Style"},"batch_size":50}}},{"name":"content","description":null,"type":{"$":"type","name":"com.example.objectionapp.view.View"}}]},"CenterHorizontally":{"$":"struct","properties":[{"name":"styles","description":null,"type":{"$":"optional","child":{"$":"list","item":{"$":"type","name":"com.example.objectionapp.view.Style"},"batch_size":50}}},{"name":"content","description":null,"type":{"$":"type","name":"com.example.objectionapp.view.View"}}]},"com.example.objectionapp.view.ImageViewContentScale?":{"$":"enum","discriminator_key":"$","content_key":null,"variants":[{"name":"Crop","description":null,"type":null},{"name":"FillBounds","description":null,"type":null},{"name":"FillHeight","description":null,"type":null},{"name":"FillWidth","description":null,"type":null},{"name":"Fit","description":null,"type":null},{"name":"Inside","description":null,"type":null}]},"Layout":{"$":"struct","properties":[{"name":"topBar","description":null,"type":{"$":"optional","child":{"$":"type","name":"com.example.objectionapp.view.View?"}}},{"name":"tabBar","description":null,"type":{"$":"optional","child":{"$":"type","name":"com.example.objectionapp.view.TabBar?"}}},{"name":"currentPageId","description":null,"type":{"$":"optional","child":{"$":"reference","expected_top_level_variant":"Page"}}}]},"com.example.objectionapp.Link?":{"$":"struct","properties":[{"name":"pageId","description":null,"type":{"$":"reference","expected_top_level_variant":"Page"}},{"name":"useSheet","description":null,"type":{"$":"optional","child":{"$":"boolean"}}}]},"Theme":{"$":"struct","properties":[{"name":"disableDynamicTheme","description":null,"type":{"$":"boolean"}},{"name":"lightColorScheme","description":null,"type":{"$":"type","name":"com.example.objectionapp.ColorScheme"}},{"name":"darkColorScheme","description":null,"type":{"$":"type","name":"com.example.objectionapp.ColorScheme"}},{"name":"iconPack","description":null,"type":{"$":"type","name":"com.example.objectionapp.IconPack"}}]},"Icon":{"$":"struct","properties":[{"name":"styles","description":null,"type":{"$":"optional","child":{"$":"list","item":{"$":"type","name":"com.example.objectionapp.view.Style"},"batch_size":50}}},{"name":"name","description":null,"type":{"$":"string"}}]},"Row":{"$":"struct","properties":[{"name":"styles","description":null,"type":{"$":"optional","child":{"$":"list","item":{"$":"type","name":"com.example.objectionapp.view.Style"},"batch_size":50}}},{"name":"spacing","description":null,"type":{"$":"optional","child":{"$":"number"}}},{"name":"items","description":null,"type":{"$":"optional","child":{"$":"list","item":{"$":"type","name":"com.example.objectionapp.view.FlexItem"},"batch_size":50}}},{"name":"alignment","description":null,"type":{"$":"optional","child":{"$":"type","name":"com.example.objectionapp.view.VerticalAlignment?"}}}]},"com.example.objectionapp.view.FlexItem":{"$":"struct","properties":[{"name":"expand","description":null,"type":{"$":"optional","child":{"$":"boolean"}}},{"name":"content","description":null,"type":{"$":"type","name":"com.example.objectionapp.view.View"}}]}},"version":"0.1","initial_objects":[{"id":"theme_default","description":"The theme that will be applied by default to all UI elements","expected_top_level_variant":null},{"id":"layout_default","description":"The layout that will wrap everything","expected_top_level_variant":null}]}
\ No newline at end of file