Index: TECH/System/SystemAPI.cls.xml
===================================================================
diff -u
--- TECH/System/SystemAPI.cls.xml	(revision 0)
+++ TECH/System/SystemAPI.cls.xml	(revision 1069)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.System.SystemAPI">
+<Abstract>1</Abstract>
+<Super>TECH.Interface</Super>
+
+<Method name="GeefServerNaam">
+<Abstract>1</Abstract>
+<ReturnType>%String</ReturnType>
+</Method>
+</Class>
+
+
+</Export>
Index: TECH/Context.cls.xml
===================================================================
diff -u -r1051 -r1069
--- TECH/Context.cls.xml	(.../Context.cls.xml)	(revision 1051)
+++ TECH/Context.cls.xml	(.../Context.cls.xml)	(revision 1069)
@@ -52,6 +52,11 @@
 <Default>PubSubAPI</Default>
 </Parameter>
 
+<Parameter name="SystemAPI">
+<Type>%String</Type>
+<Default>SystemAPI</Default>
+</Parameter>
+
 <Method name="Instance">
 <ClassMethod>1</ClassMethod>
 <ReturnType>TECH.Context</ReturnType>
@@ -192,6 +197,23 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefSystemAPI">
+<ReturnType>TECH.System.SystemAPI</ReturnType>
+<Implementation><![CDATA[	quit ..GeefAPIObject(..#SystemAPI)
+]]></Implementation>
+</Method>
+
+<Method name="PushSystemAPIClassName">
+<FormalSpec>Naam:%String</FormalSpec>
+<Implementation><![CDATA[	Do ..PushAPINaam(..#SystemAPI,Naam)
+]]></Implementation>
+</Method>
+
+<Method name="PopSystemAPIClassName">
+<Implementation><![CDATA[	Do ..PopAPINaam(..#SystemAPI)
+]]></Implementation>
+</Method>
+
 <Method name="Reset">
 <Implementation><![CDATA[
 	Set APINamenIterator = ##class(TECH.ListIterator).%New(..APINamen)
@@ -210,6 +232,7 @@
 	Do ..PushFileAPIClassName(##class(TECH.File.impl.FileAPI).%ClassName(1))
 	Do ..PushQueryAPIClassName(##class(TECH.Query.impl.QueryAPI).%ClassName(1))
 	Do ..PushPubSubAPIClassName(##class(TECH.PubSub.impl.PubSubAPI).%ClassName(1))
+	Do ..PushSystemAPIClassName(##class(TECH.System.impl.SystemAPI).%ClassName(1))
 ]]></Implementation>
 </Method>
 
Index: TECH/System/impl/SystemAPI.cls.xml
===================================================================
diff -u
--- TECH/System/impl/SystemAPI.cls.xml	(revision 0)
+++ TECH/System/impl/SystemAPI.cls.xml	(revision 1069)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.System.impl.SystemAPI">
+<Super>TECH.RegisteredObject,TECH.System.SystemAPI</Super>
+
+<Method name="GeefServerNaam">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $$$Server
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>