diff --git a/_goals/10_bokehjs.md b/_goals/10_bokehjs.md
deleted file mode 100644
index d147133..0000000
--- a/_goals/10_bokehjs.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-description: Develop BokehJS as a First-class JavaScript Library
----
-By and large none of the core contributors have been JS or front-end experts, and for some time the client side BokehJS library was an implementation detail.
-There is more interest to use BokehJS directly, and with attention from experienced front-end JS developers, BokehJS could integrate better with existing common web frameworks and tools than it currently does.
-This includes making much more accessible documentation for BokehJS itself.
-These improvements would also help increase the potential pool of core developers interested in maintaining BokehJS over the long run.
diff --git a/_goals/70_mathtext.md b/_goals/70_mathtext.md
deleted file mode 100644
index d4fc944..0000000
--- a/_goals/70_mathtext.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-description: Built-in LaTeX / MathText Support
----
-Bokeh can display mathematical symbols and formulas by creating and using custom extensions.
-Users have expressed a desire for this capability to be more directly integrated, e.g to draw math text for axis or tick labels, without needing to resort to a custom extension.
diff --git a/_goals/93_timezone.md b/_goals/93_timezone.md
new file mode 100644
index 0000000..1ac4426
--- /dev/null
+++ b/_goals/93_timezone.md
@@ -0,0 +1,6 @@
+---
+description: Timezone Support
+---
+Bokeh currently ignores timezone information when displaying and handling dates and times.
+It could be modified to handle timezones, which includes potentially different timezones on the
+server and in the browser, and daylight saving time changes.
\ No newline at end of file
diff --git a/_goals/96_client_server.md b/_goals/96_client_server.md
new file mode 100644
index 0000000..791d57d
--- /dev/null
+++ b/_goals/96_client_server.md
@@ -0,0 +1,9 @@
+---
+description: Pluggable Client-Server Communications
+---
+Bokeh uses Tornado and WebSockets for communication between the server and client, and bespoke
+code to serialize/deserialize messages.
+It would be beneficial to decouple Bokeh functionality from the communication implementation and
+allow others such as those based on Jupyter and ZeroMQ for example.
+This would require a review and specification of the required communcation and serialization
+functionality, and at least two pluggable implementations, one of which would be the current one.
\ No newline at end of file