diff --git a/repository/BaselineOfGrease.package/.filetree b/repository/BaselineOfGrease.package/.filetree
index 57a67973..8998102c 100644
--- a/repository/BaselineOfGrease.package/.filetree
+++ b/repository/BaselineOfGrease.package/.filetree
@@ -1,5 +1,4 @@
 {
-	"separateMethodMetaAndSource" : false,
 	"noMethodMetaData" : true,
-	"useCypressPropertiesFile" : true
-}
\ No newline at end of file
+	"separateMethodMetaAndSource" : false,
+	"useCypressPropertiesFile" : true }
diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baseline..st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baseline..st
index 57f301d6..d254e935 100644
--- a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baseline..st
+++ b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baseline..st
@@ -188,7 +188,7 @@ baseline: spec
         package: 'Grease-GemStone240-Core'
           with: [ spec requires: #('Grease-GemStone-Core') ] ].
   spec
-    for: #'gs3.x'
+    for: #(#'gs3.0.x' #'gs3.1.x' #'gs3.2.x')
     do: [ 
       spec
         package: 'Grease-GemStone-Core'
@@ -198,9 +198,21 @@ baseline: spec
               spec
                 requires: #('Grease-GemStone-Core');
                 postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ].
+  spec
+    for: #(#'gs3.3.x' #'gs3.4.x')
+    do: [ 
+      spec
+        package: 'Grease-GemStone330-Core';
+        package: 'Grease-GemStone-Core'
+          with: [ spec includes: #('Grease-GemStone330-Core') ];
+        package: 'Grease-GemStone330-Core'
+          with: [ 
+              spec
+                requires: #('Grease-GemStone-Core');
+                postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ].
   spec
     for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x')
     do: [ 
       spec
         package: 'Grease-Tests-GemStone-Core'
-        with: [ spec file: 'Grease-Tests-GemStone-Core.v32' ] ]
\ No newline at end of file
+        with: [ spec file: 'Grease-Tests-GemStone-Core.v32' ] ]
diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/methodProperties.json b/repository/BaselineOfGrease.package/BaselineOfGrease.class/methodProperties.json
index 169a0568..1b0b5748 100644
--- a/repository/BaselineOfGrease.package/BaselineOfGrease.class/methodProperties.json
+++ b/repository/BaselineOfGrease.package/BaselineOfGrease.class/methodProperties.json
@@ -1,8 +1,7 @@
 {
+	"class" : {
+		 },
 	"instance" : {
+		"baseline:" : "JohanBrichau 11/18/2017 16:17",
 		"initializeLatin1ToUtf8Encodings" : "JohanBrichau 10/19/2014 10:00",
-		"slimeForSqueakPharo1xPharo2x:" : "JohanBrichau 02/16/2014 03:49",
-		"baseline:" : "JohanBrichau 11/18/2017 16:17"
-	},
-	"class" : { }
-}
\ No newline at end of file
+		"slimeForSqueakPharo1xPharo2x:" : "JohanBrichau 02/16/2014 03:49" } }
diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/properties.json b/repository/BaselineOfGrease.package/BaselineOfGrease.class/properties.json
index 0260395f..8a39c621 100644
--- a/repository/BaselineOfGrease.package/BaselineOfGrease.class/properties.json
+++ b/repository/BaselineOfGrease.package/BaselineOfGrease.class/properties.json
@@ -1,11 +1,14 @@
 {
-	"commentStamp" : "",
-	"super" : "BaselineOf",
 	"category" : "BaselineOfGrease",
-	"classinstvars" : [ ],
-	"pools" : [ ],
-	"classvars" : [ ],
-	"instvars" : [ ],
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		 ],
 	"name" : "BaselineOfGrease",
-	"type" : "normal"
-}
\ No newline at end of file
+	"pools" : [
+		 ],
+	"super" : "BaselineOf",
+	"type" : "normal" }
diff --git a/repository/BaselineOfGrease.package/monticello.meta/version b/repository/BaselineOfGrease.package/monticello.meta/version
index 9bd7b457..074c08fa 100644
--- a/repository/BaselineOfGrease.package/monticello.meta/version
+++ b/repository/BaselineOfGrease.package/monticello.meta/version
@@ -1,2 +1,2 @@
-(name 'BaselineOfGrease-JohanBrichau.1496564075' message 'Pharo7 support' id 'a8370418-a51a-0d00-a9b9-68b104322501' date '18 November 2017' time '4:17:52.094479 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-topa.1496564074' message 'Splice out Squeak6' id '1f990177-0195-46d7-b815-43ff320f8900' date '15 November 2017' time '5:36:47.836067 pm' author 'topa' ancestors ((name 'BaselineOfGrease-topa.1496564073' message 'Add Squeak6 (current trunk)' id 'c284dcef-9b71-4069-94b7-a2e8c42b6c0a' date '8 November 2017' time '11:59:28.059517 am' author 'topa' ancestors ((name 'BaselineOfGrease-dkh.1496564072' message 'merged by GitFileTree-MergeDriver' id 'a721b096-25cd-455c-a419-2fac8a9331c7' date '23 July 2017' time '11:33:54.267473 am' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.19' message 'merged by GitFileTree-MergeDriver' id 'b05179de-cbe6-4b80-824b-f6220d2c9252' date '25 May 2017' time '11:41:41.478907 am' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.17' message 'eliminate some seaside.gemstone.com references' id '01c1cf6a-4d84-47d2-97f0-b9c4d7fffd58' date '28 February 2017' time '1:54:50 pm' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.16' message 'merged by GitFileTree-MergeDriver' id '644ab134-dd42-4b9f-948b-c277cd963d5d' date '26 August 2016' time '5:20:50 am' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.15' message 'merged by GitFileTree-MergeDriver' id '86b6f4f6-f95f-4bd7-9224-f31c5460e354' date '4 April 2016' time '9:40:53 am' author 'dkh' ancestors () stepChildren ())(name 'BaselineOfGrease-dkh.15' message 'merged by GitFileTree-MergeDriver' id '415af41c-2c3d-40a8-9f75-d9e8de921224' date '26 August 2016' time '2:19:29 am' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.10' message 'update for GemStone 3.4 ...' id 'ad7f9331-d83f-4976-bf57-1d1e81111fc6' date '21 December 2015' time '3:07:11 pm' author 'dkh' ancestors () stepChildren ())(name 'BaselineOfGrease-JohanBrichau.14' message 'Ensure Squeak5 tests package is loaded in Squeak5' id 'abde1bd6-a8d6-45fc-a922-bcf63ec38f03' date '27 February 2016' time '1:47:23 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.13' message 'Forked Grease-Tests-Pharo-Core into Grease-Tests-Squeak5-Core' id '3a01ebbc-8859-45db-ae5a-e5de8073d3a4' date '27 February 2016' time '1:40:18 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.12' message 'added Pharo-Tests to Squeak5 load' id 'ffe11ade-e4f1-496d-ae59-74543cfad134' date '27 February 2016' time '1:21:56 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.11' message 'added pharo5 platform to baseline' id '5c0332e9-ef4c-43cd-9066-7c9fe9ed6506' date '27 February 2016' time '12:12:12 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.10' message 'added squeak 5 platform' id '18f9d568-869f-4550-804a-b0ba101f33f3' date '13 December 2015' time '8:36:25 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-dkh.9' message 'Update baseline for GemStone 3.3' id 'af9364dd-14bc-4e5e-9fc7-0abe08732ab2' date '26 May 2015' time '11:46:07 am' author 'dkh' ancestors ((name 'BaselineOfGrease-JohanBrichau.8' message 'separate package for Squeak' id '91c019c7-2b8b-40c3-97d9-2047a69512a7' date '22 March 2015' time '12:01:37 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.7' message 'included Pharo 4 and did some baseline formatting' id '3722041d-d4b5-4496-a25a-0e891fe9a945' date '8 November 2014' time '9:28:01 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.6' message 'added initializeLatin1ToUtf8Encodings' id '4d976044-1aa9-44b6-bab0-b66ac758b3cd' date '19 October 2014' time '10:05:25 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.6' message 'added initializeLatin1ToUtf8Encodings' id 'b4ac5766-d472-4557-beff-59e5b733bce0' date '19 October 2014' time '10:04:55 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-dkh.5' message 'typoe' id '93eb3230-7956-4a6e-85dc-243f3dd895a1' date '4 June 2014' time '3:13:26 pm' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.4' message 'woops specified the package branch incorrectly ... I think I got it right this time...' id '3003ee31-9d17-4dd1-9b9a-f8a80e4f0ba1' date '4 June 2014' time '3:12:31 pm' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.3' message 'add Grease-Tests-GemStone-Core.v32 to baseline' id '26f128ca-b62e-4295-9a58-a9758b670c37' date '4 June 2014' time '2:57:48 pm' author 'dkh' ancestors ((name 'BaselineOfGrease-JohanBrichau.2' message 'forgotten methods' id '38758da9-c922-4530-a19e-f8783900e787' date '16 February 2014' time '3:50:22 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1' message 'first baseline' id 'b89398df-14c6-4b6a-a2ba-91ad806bb07f' date '16 February 2014' time '1:49:46 am' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(name 'BaselineOfGrease-JohanBrichau.18' message 'Pharo 6 compatibility' id 'd2d614aa-b80c-0d00-b4b6-ae9900bfc9db' date '25 May 2017' time '12:46:04.246978 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.17' message 'Added pharo6' id '52335469-982c-483b-a975-4518820b9bcf' date '25 May 2017' time '11:20:35.004053 am' author 'JohanBrichau' ancestors ((id '644ab134-dd42-4b9f-948b-c277cd963d5d')) stepChildren ())) stepChildren ())) stepChildren ())(name 'BaselineOfGrease-JohanBrichau.1496564071' message 'Fixed dependency of Grease-Tests-Core on the platform packages for GRDynamicVariableTest' id '6dd3612c-6111-0d00-8806-761908c307d1' date '23 July 2017' time '7:29:11.347398 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1496564070' message '- Removed pharo1.x and 2.x from the baseline since no longer supported.

- Fixed dependency of Grease-Tests-Core on the platform packages for GRDynamicVariableTest' id 'd3220dff-6011-0d00-8805-b8f708c307d1' date '23 July 2017' time '7:16:30.82261 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1496564069' message 'Updated load snippets [ci skip]
-' id '26eaf907-cb05-504d-b251-ce1bcf3132ec' date '4 June 2017' time '10:14:29 am' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
\ No newline at end of file
+(name 'BaselineOfGrease-JohanBrichau.1496564077' message 'merged by GitFileTree-MergeDriver' id '78a5da19-96f2-4882-b983-e03dc820611b' date '19 November 2017' time '11:26:06.234613 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1496564076' message 'merged by GitFileTree-MergeDriver' id 'e28f8c82-dd50-433c-9b9a-2347b11f5d0b' date '19 November 2017' time '11:14:30.449821 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1496564075' message 'Pharo7 support' id 'a8370418-a51a-0d00-a9b9-68b104322501' date '18 November 2017' time '4:17:52.094479 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-topa.1496564074' message 'Splice out Squeak6' id '1f990177-0195-46d7-b815-43ff320f8900' date '15 November 2017' time '5:36:47.836067 pm' author 'topa' ancestors ((name 'BaselineOfGrease-topa.1496564073' message 'Add Squeak6 (current trunk)' id 'c284dcef-9b71-4069-94b7-a2e8c42b6c0a' date '8 November 2017' time '11:59:28.059517 am' author 'topa' ancestors ((name 'BaselineOfGrease-dkh.1496564072' message 'merged by GitFileTree-MergeDriver' id 'a721b096-25cd-455c-a419-2fac8a9331c7' date '23 July 2017' time '11:33:54.267473 am' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.19' message 'merged by GitFileTree-MergeDriver' id 'b05179de-cbe6-4b80-824b-f6220d2c9252' date '25 May 2017' time '11:41:41.478907 am' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.17' message 'eliminate some seaside.gemstone.com references' id '01c1cf6a-4d84-47d2-97f0-b9c4d7fffd58' date '28 February 2017' time '1:54:50 pm' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.16' message 'merged by GitFileTree-MergeDriver' id '644ab134-dd42-4b9f-948b-c277cd963d5d' date '26 August 2016' time '5:20:50 am' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.15' message 'merged by GitFileTree-MergeDriver' id '86b6f4f6-f95f-4bd7-9224-f31c5460e354' date '4 April 2016' time '9:40:53 am' author 'dkh' ancestors () stepChildren ())(name 'BaselineOfGrease-dkh.15' message 'merged by GitFileTree-MergeDriver' id '415af41c-2c3d-40a8-9f75-d9e8de921224' date '26 August 2016' time '2:19:29 am' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.10' message 'update for GemStone 3.4 ...' id 'ad7f9331-d83f-4976-bf57-1d1e81111fc6' date '21 December 2015' time '3:07:11 pm' author 'dkh' ancestors () stepChildren ())(name 'BaselineOfGrease-JohanBrichau.14' message 'Ensure Squeak5 tests package is loaded in Squeak5' id 'abde1bd6-a8d6-45fc-a922-bcf63ec38f03' date '27 February 2016' time '1:47:23 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.13' message 'Forked Grease-Tests-Pharo-Core into Grease-Tests-Squeak5-Core' id '3a01ebbc-8859-45db-ae5a-e5de8073d3a4' date '27 February 2016' time '1:40:18 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.12' message 'added Pharo-Tests to Squeak5 load' id 'ffe11ade-e4f1-496d-ae59-74543cfad134' date '27 February 2016' time '1:21:56 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.11' message 'added pharo5 platform to baseline' id '5c0332e9-ef4c-43cd-9066-7c9fe9ed6506' date '27 February 2016' time '12:12:12 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.10' message 'added squeak 5 platform' id '18f9d568-869f-4550-804a-b0ba101f33f3' date '13 December 2015' time '8:36:25 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-dkh.9' message 'Update baseline for GemStone 3.3' id 'af9364dd-14bc-4e5e-9fc7-0abe08732ab2' date '26 May 2015' time '11:46:07 am' author 'dkh' ancestors ((name 'BaselineOfGrease-JohanBrichau.8' message 'separate package for Squeak' id '91c019c7-2b8b-40c3-97d9-2047a69512a7' date '22 March 2015' time '12:01:37 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.7' message 'included Pharo 4 and did some baseline formatting' id '3722041d-d4b5-4496-a25a-0e891fe9a945' date '8 November 2014' time '9:28:01 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.6' message 'added initializeLatin1ToUtf8Encodings' id '4d976044-1aa9-44b6-bab0-b66ac758b3cd' date '19 October 2014' time '10:05:25 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.6' message 'added initializeLatin1ToUtf8Encodings' id 'b4ac5766-d472-4557-beff-59e5b733bce0' date '19 October 2014' time '10:04:55 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-dkh.5' message 'typoe' id '93eb3230-7956-4a6e-85dc-243f3dd895a1' date '4 June 2014' time '3:13:26 pm' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.4' message 'woops specified the package branch incorrectly ... I think I got it right this time...' id '3003ee31-9d17-4dd1-9b9a-f8a80e4f0ba1' date '4 June 2014' time '3:12:31 pm' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.3' message 'add Grease-Tests-GemStone-Core.v32 to baseline' id '26f128ca-b62e-4295-9a58-a9758b670c37' date '4 June 2014' time '2:57:48 pm' author 'dkh' ancestors ((name 'BaselineOfGrease-JohanBrichau.2' message 'forgotten methods' id '38758da9-c922-4530-a19e-f8783900e787' date '16 February 2014' time '3:50:22 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1' message 'first baseline' id 'b89398df-14c6-4b6a-a2ba-91ad806bb07f' date '16 February 2014' time '1:49:46 am' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(name 'BaselineOfGrease-JohanBrichau.18' message 'Pharo 6 compatibility' id 'd2d614aa-b80c-0d00-b4b6-ae9900bfc9db' date '25 May 2017' time '12:46:04.246978 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.17' message 'Added pharo6' id '52335469-982c-483b-a975-4518820b9bcf' date '25 May 2017' time '11:20:35.004053 am' author 'JohanBrichau' ancestors ((id '644ab134-dd42-4b9f-948b-c277cd963d5d')) stepChildren ())) stepChildren ())) stepChildren ())(name 'BaselineOfGrease-JohanBrichau.1496564071' message 'Fixed dependency of Grease-Tests-Core on the platform packages for GRDynamicVariableTest' id '6dd3612c-6111-0d00-8806-761908c307d1' date '23 July 2017' time '7:29:11.347398 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1496564070' message '- Removed pharo1.x and 2.x from the baseline since no longer supported.

- Fixed dependency of Grease-Tests-Core on the platform packages for GRDynamicVariableTest' id 'd3220dff-6011-0d00-8805-b8f708c307d1' date '23 July 2017' time '7:16:30.82261 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1496564069' message 'Updated load snippets [ci skip]
+' id '26eaf907-cb05-504d-b251-ce1bcf3132ec' date '4 June 2017' time '10:14:29 am' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(name 'BaselineOfGrease-JohanBrichau.1496564073' message 'Fix issue #20: encoding to utf8 breaks in GemStone 3.3+' id 'e9410295-6b3c-4eb3-8a28-e1191b60cb82' date '7 October 2017' time '6:48:31 am' author 'JohanBrichau' ancestors ((id 'a721b096-25cd-455c-a419-2fac8a9331c7')) stepChildren ())) stepChildren ())(name 'BaselineOfGrease-JohanBrichau.1496564074' message 'Adapted baseline for a different package in GS3.3 and forward' id '4f023a3c-fdea-4577-a8c8-055680797042' date '7 October 2017' time '6:52:04 am' author 'JohanBrichau' ancestors ((id 'e9410295-6b3c-4eb3-8a28-e1191b60cb82')) stepChildren ())) stepChildren ())
\ No newline at end of file
diff --git a/repository/BaselineOfGrease.package/properties.json b/repository/BaselineOfGrease.package/properties.json
index 6f31cf5a..f037444a 100644
--- a/repository/BaselineOfGrease.package/properties.json
+++ b/repository/BaselineOfGrease.package/properties.json
@@ -1 +1,2 @@
-{ }
\ No newline at end of file
+{
+	 }
diff --git a/repository/Grease-GemStone330-Core.package/.filetree b/repository/Grease-GemStone330-Core.package/.filetree
new file mode 100644
index 00000000..8998102c
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/.filetree
@@ -0,0 +1,4 @@
+{
+	"noMethodMetaData" : true,
+	"separateMethodMetaAndSource" : false,
+	"useCypressPropertiesFile" : true }
diff --git a/repository/Grease-GemStone330-Core.package/Exception.extension/instance/greaseString.st b/repository/Grease-GemStone330-Core.package/Exception.extension/instance/greaseString.st
new file mode 100644
index 00000000..ea4bff53
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/Exception.extension/instance/greaseString.st
@@ -0,0 +1,4 @@
+*grease-gemstone330-core
+greaseString
+
+	^self description
\ No newline at end of file
diff --git a/repository/Grease-GemStone330-Core.package/Exception.extension/methodProperties.json b/repository/Grease-GemStone330-Core.package/Exception.extension/methodProperties.json
new file mode 100644
index 00000000..a42f9dba
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/Exception.extension/methodProperties.json
@@ -0,0 +1,5 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"greaseString" : "DaleHenrichs 07/22/2010 14:14" } }
diff --git a/repository/Grease-GemStone330-Core.package/Exception.extension/properties.json b/repository/Grease-GemStone330-Core.package/Exception.extension/properties.json
new file mode 100644
index 00000000..6dcfd842
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/Exception.extension/properties.json
@@ -0,0 +1,2 @@
+{
+	"name" : "Exception" }
diff --git a/repository/Grease-GemStone330-Core.package/ExecBlock.extension/instance/argumentCount.st b/repository/Grease-GemStone330-Core.package/ExecBlock.extension/instance/argumentCount.st
new file mode 100644
index 00000000..9f25fa98
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/ExecBlock.extension/instance/argumentCount.st
@@ -0,0 +1,4 @@
+*grease-gemstone330-core
+argumentCount
+
+	^self numArgs.
\ No newline at end of file
diff --git a/repository/Grease-GemStone330-Core.package/ExecBlock.extension/instance/fixCallbackTemps.st b/repository/Grease-GemStone330-Core.package/ExecBlock.extension/instance/fixCallbackTemps.st
new file mode 100644
index 00000000..d46ed053
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/ExecBlock.extension/instance/fixCallbackTemps.st
@@ -0,0 +1,4 @@
+*grease-gemstone330-core
+fixCallbackTemps
+	"Fix the values of the temporary variables used in the block that are 
+	ordinarily shared with the method in which the block is defined."
\ No newline at end of file
diff --git a/repository/Grease-GemStone330-Core.package/ExecBlock.extension/instance/ifCurtailed..st b/repository/Grease-GemStone330-Core.package/ExecBlock.extension/instance/ifCurtailed..st
new file mode 100644
index 00000000..cc75520a
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/ExecBlock.extension/instance/ifCurtailed..st
@@ -0,0 +1,11 @@
+*grease-gemstone330-core
+ifCurtailed: aBlock
+
+	| wasCurtailed |
+	wasCurtailed := true.
+	[
+		self value.
+		wasCurtailed := false.
+	] ensure: [
+		wasCurtailed ifTrue: aBlock.
+	].
\ No newline at end of file
diff --git a/repository/Grease-GemStone330-Core.package/ExecBlock.extension/instance/valueWithPossibleArguments..st b/repository/Grease-GemStone330-Core.package/ExecBlock.extension/instance/valueWithPossibleArguments..st
new file mode 100644
index 00000000..5e1d8c5d
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/ExecBlock.extension/instance/valueWithPossibleArguments..st
@@ -0,0 +1,9 @@
+*grease-gemstone330-core
+valueWithPossibleArguments: anArray 
+     "Evaluate the block represented by the receiver with the arguments provided."
+  | n args | 
+  (n := self numArgs) == 0 ifTrue: [^self value].
+  args := anArray copy
+		size: n;
+		yourself.
+  ^ self valueWithArguments: args.
\ No newline at end of file
diff --git a/repository/Grease-GemStone330-Core.package/ExecBlock.extension/methodProperties.json b/repository/Grease-GemStone330-Core.package/ExecBlock.extension/methodProperties.json
new file mode 100644
index 00000000..04f15100
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/ExecBlock.extension/methodProperties.json
@@ -0,0 +1,8 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"argumentCount" : "DaleHenrichs 07/22/2010 16:23",
+		"fixCallbackTemps" : "DaleHenrichs 07/22/2010 16:24",
+		"ifCurtailed:" : "DaleHenrichs 07/22/2010 16:25",
+		"valueWithPossibleArguments:" : "DaleHenrichs 07/22/2010 16:23" } }
diff --git a/repository/Grease-GemStone330-Core.package/ExecBlock.extension/properties.json b/repository/Grease-GemStone330-Core.package/ExecBlock.extension/properties.json
new file mode 100644
index 00000000..d8195e28
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/ExecBlock.extension/properties.json
@@ -0,0 +1,2 @@
+{
+	"name" : "ExecBlock" }
diff --git a/repository/Grease-GemStone330-Core.package/GRGemStonePlatform.extension/instance/gemstoneExceptionSelector.st b/repository/Grease-GemStone330-Core.package/GRGemStonePlatform.extension/instance/gemstoneExceptionSelector.st
new file mode 100644
index 00000000..05cad772
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/GRGemStonePlatform.extension/instance/gemstoneExceptionSelector.st
@@ -0,0 +1,4 @@
+*grease-gemstone330-core
+gemstoneExceptionSelector
+
+	^ (ExceptionSet new) , Halt, AlmostOutOfStack, Breakpoint
\ No newline at end of file
diff --git a/repository/Grease-GemStone330-Core.package/GRGemStonePlatform.extension/instance/generateHardBreak.st b/repository/Grease-GemStone330-Core.package/GRGemStonePlatform.extension/instance/generateHardBreak.st
new file mode 100644
index 00000000..458d1366
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/GRGemStonePlatform.extension/instance/generateHardBreak.st
@@ -0,0 +1,5 @@
+*grease-gemstone330-core
+generateHardBreak
+	"Generate a GemStone hard break"
+
+	^Break signal: 'interrupted for Seaside debugging'
\ No newline at end of file
diff --git a/repository/Grease-GemStone330-Core.package/GRGemStonePlatform.extension/instance/handlesAlmostOutOfStackException..st b/repository/Grease-GemStone330-Core.package/GRGemStonePlatform.extension/instance/handlesAlmostOutOfStackException..st
new file mode 100644
index 00000000..725be222
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/GRGemStonePlatform.extension/instance/handlesAlmostOutOfStackException..st
@@ -0,0 +1,4 @@
+*grease-gemstone330-core
+handlesAlmostOutOfStackException: anException
+
+	^AlmostOutOfStack handles: anException
\ No newline at end of file
diff --git a/repository/Grease-GemStone330-Core.package/GRGemStonePlatform.extension/instance/handlesBreakpointException..st b/repository/Grease-GemStone330-Core.package/GRGemStonePlatform.extension/instance/handlesBreakpointException..st
new file mode 100644
index 00000000..d82b699a
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/GRGemStonePlatform.extension/instance/handlesBreakpointException..st
@@ -0,0 +1,4 @@
+*grease-gemstone330-core
+handlesBreakpointException: anException
+
+	^Breakpoint handles: anException
\ No newline at end of file
diff --git a/repository/Grease-GemStone330-Core.package/GRGemStonePlatform.extension/instance/handlesHaltException..st b/repository/Grease-GemStone330-Core.package/GRGemStonePlatform.extension/instance/handlesHaltException..st
new file mode 100644
index 00000000..45fffeb8
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/GRGemStonePlatform.extension/instance/handlesHaltException..st
@@ -0,0 +1,4 @@
+*grease-gemstone330-core
+handlesHaltException: anException
+
+	^Halt handles: anException
\ No newline at end of file
diff --git a/repository/Grease-GemStone330-Core.package/GRGemStonePlatform.extension/methodProperties.json b/repository/Grease-GemStone330-Core.package/GRGemStonePlatform.extension/methodProperties.json
new file mode 100644
index 00000000..6c9ad74e
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/GRGemStonePlatform.extension/methodProperties.json
@@ -0,0 +1,9 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"gemstoneExceptionSelector" : "dkh 10/14/2011 17:11",
+		"generateHardBreak" : "dkh 10/14/2011 16:57",
+		"handlesAlmostOutOfStackException:" : "dkh 10/14/2011 17:18",
+		"handlesBreakpointException:" : "dkh 10/14/2011 17:18",
+		"handlesHaltException:" : "dkh 10/14/2011 17:18" } }
diff --git a/repository/Grease-GemStone330-Core.package/GRGemStonePlatform.extension/properties.json b/repository/Grease-GemStone330-Core.package/GRGemStonePlatform.extension/properties.json
new file mode 100644
index 00000000..eab5d9b5
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/GRGemStonePlatform.extension/properties.json
@@ -0,0 +1,2 @@
+{
+	"name" : "GRGemStonePlatform" }
diff --git a/repository/Grease-GemStone330-Core.package/GRUtf8CodecStream.class/README.md b/repository/Grease-GemStone330-Core.package/GRUtf8CodecStream.class/README.md
new file mode 100644
index 00000000..e69de29b
diff --git a/repository/Grease-GemStone330-Core.package/GRUtf8CodecStream.class/class/initialize.st b/repository/Grease-GemStone330-Core.package/GRUtf8CodecStream.class/class/initialize.st
new file mode 100644
index 00000000..fa779537
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/GRUtf8CodecStream.class/class/initialize.st
@@ -0,0 +1,12 @@
+initialization
+initialize
+  "self initialize"
+
+  Latin1ToUtf8Encodings := Array new: 256.
+  1 to: 256 do: [ :index | 
+    index > 128
+      ifTrue: [ 
+        Latin1ToUtf8Encodings
+          at: index
+          put:
+            (String with: (Character codePoint: index - 1)) encodeAsUTF8 asString ] ]
\ No newline at end of file
diff --git a/repository/Grease-GemStone330-Core.package/GRUtf8CodecStream.class/instance/crlf.st b/repository/Grease-GemStone330-Core.package/GRUtf8CodecStream.class/instance/crlf.st
new file mode 100644
index 00000000..e5bb258a
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/GRUtf8CodecStream.class/instance/crlf.st
@@ -0,0 +1,9 @@
+streaming
+crlf
+	binary
+		ifTrue: [
+			stream nextPut: 13.
+			stream nextPut: 10 ]
+		ifFalse: [
+			stream nextPut: Character cr.
+			stream nextPut: Character lf ]
\ No newline at end of file
diff --git a/repository/Grease-GemStone330-Core.package/GRUtf8CodecStream.class/instance/invalidUtf8.st b/repository/Grease-GemStone330-Core.package/GRUtf8CodecStream.class/instance/invalidUtf8.st
new file mode 100644
index 00000000..d38b2f3b
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/GRUtf8CodecStream.class/instance/invalidUtf8.st
@@ -0,0 +1,3 @@
+private
+invalidUtf8
+	^GRInvalidUtf8Error signal: 'Invalid UTF-8 input'
\ No newline at end of file
diff --git a/repository/Grease-GemStone330-Core.package/GRUtf8CodecStream.class/instance/next..st b/repository/Grease-GemStone330-Core.package/GRUtf8CodecStream.class/instance/next..st
new file mode 100644
index 00000000..2f2af983
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/GRUtf8CodecStream.class/instance/next..st
@@ -0,0 +1,37 @@
+streaming
+next: anInteger
+	"Convert the given string from UTF-8 using the fast path if converting to Latin-1"
+	| outStream byte1 byte2 byte3 byte4 unicode count |
+	outStream := WriteStream on: (String new: anInteger).
+	count := 0.
+	[ count < anInteger and: [ stream atEnd not ] ] whileTrue: [
+		byte1 := stream next.
+		unicode := byte1.
+		(byte1 bitAnd: 16rE0) = 192 ifTrue: [ "two bytes"
+			byte2 := stream next.
+			(byte2 bitAnd: 16rC0) = 16r80 ifFalse: [ self invalidUtf8 ].
+			unicode := ((byte1 bitAnd: 31) bitShift: 6) + (byte2 bitAnd: 63)].
+		(byte1 bitAnd: 16rF0) = 224 ifTrue: [ "three bytes"
+			byte2 := stream next.
+			(byte2 bitAnd: 16rC0) = 16r80 ifFalse: [ self invalidUtf8 ].
+			byte3 := stream next.
+			(byte3 bitAnd: 16rC0) = 16r80 ifFalse: [ self invalidUtf8 ].
+			unicode := ((byte1 bitAnd: 15) bitShift: 12) + ((byte2 bitAnd: 63) bitShift: 6)
+				+ (byte3 bitAnd: 63)].
+		(byte1 bitAnd: 16rF8) = 240 ifTrue: [ "four bytes"
+			byte2 := stream next.
+			(byte2 bitAnd: 16rC0) = 16r80 ifFalse: [ self invalidUtf8 ].
+			byte3 := stream next.
+			(byte3 bitAnd: 16rC0) = 16r80 ifFalse: [ self invalidUtf8 ].
+			byte4 := stream next.
+			(byte4 bitAnd: 16rC0) = 16r80 ifFalse: [ self invalidUtf8 ].
+			unicode := ((byte1 bitAnd: 16r7) bitShift: 18) +
+							((byte2 bitAnd: 63) bitShift: 12) + 
+							((byte3 bitAnd: 63) bitShift: 6) +
+							(byte4 bitAnd: 63)].
+		unicode ifNil: [ self invalidUtf8 ].
+		unicode = 16rFEFF "ignore BOM" ifFalse: [
+			outStream nextPut: (Character codePoint: unicode).
+			count := count + 1 ].
+		unicode := nil ].
+	^outStream contents
\ No newline at end of file
diff --git a/repository/Grease-GemStone330-Core.package/GRUtf8CodecStream.class/instance/nextPut..st b/repository/Grease-GemStone330-Core.package/GRUtf8CodecStream.class/instance/nextPut..st
new file mode 100644
index 00000000..1f98bba7
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/GRUtf8CodecStream.class/instance/nextPut..st
@@ -0,0 +1,17 @@
+streaming
+nextPut: aCharacter
+  "old implementation is very slow !!"
+
+  "   self nextPutAll: (String with: aCharacter)"
+
+  | codePoint |
+  codePoint := aCharacter codePoint.
+  codePoint > 127
+    ifTrue: [ 
+      codePoint > 255
+        ifTrue: [ 
+          | str |
+          str := (String with: aCharacter) encodeAsUTF8intoString.
+          stream nextPutAll: str ]
+        ifFalse: [ stream nextPutAll: (Latin1ToUtf8Encodings at: codePoint + 1) ] ]
+    ifFalse: [ stream nextPut: aCharacter ]
\ No newline at end of file
diff --git a/repository/Grease-GemStone330-Core.package/GRUtf8CodecStream.class/instance/nextPutAll..st b/repository/Grease-GemStone330-Core.package/GRUtf8CodecStream.class/instance/nextPutAll..st
new file mode 100644
index 00000000..d43ab2ef
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/GRUtf8CodecStream.class/instance/nextPutAll..st
@@ -0,0 +1,5 @@
+streaming
+nextPutAll: aString
+  binary
+    ifTrue: [ stream nextPutAll: aString asString ]
+    ifFalse: [ stream nextPutAll: aString _encodeAsUTF8intoString ]
\ No newline at end of file
diff --git a/repository/Grease-GemStone330-Core.package/GRUtf8CodecStream.class/methodProperties.json b/repository/Grease-GemStone330-Core.package/GRUtf8CodecStream.class/methodProperties.json
new file mode 100644
index 00000000..583a64fd
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/GRUtf8CodecStream.class/methodProperties.json
@@ -0,0 +1,9 @@
+{
+	"class" : {
+		"initialize" : "dkh 06/15/2015 10:48" },
+	"instance" : {
+		"crlf" : "dkh 11/06/2009 08:45",
+		"invalidUtf8" : "dkh 11/06/2009 08:45",
+		"next:" : "DaleHenrichs 08/27/2010 10:45",
+		"nextPut:" : "dkh 06/15/2015 10:44",
+		"nextPutAll:" : "JohanBrichau 10/07/2017 06:02" } }
diff --git a/repository/Grease-GemStone330-Core.package/GRUtf8CodecStream.class/properties.json b/repository/Grease-GemStone330-Core.package/GRUtf8CodecStream.class/properties.json
new file mode 100644
index 00000000..00add781
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/GRUtf8CodecStream.class/properties.json
@@ -0,0 +1,14 @@
+{
+	"category" : "Grease-GemStone330-Core",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		"Latin1ToUtf8Encodings" ],
+	"commentStamp" : "",
+	"instvars" : [
+		 ],
+	"name" : "GRUtf8CodecStream",
+	"pools" : [
+		 ],
+	"super" : "GRTextOrBinaryCodecStream",
+	"type" : "normal" }
diff --git a/repository/Grease-GemStone330-Core.package/monticello.meta/categories.st b/repository/Grease-GemStone330-Core.package/monticello.meta/categories.st
new file mode 100644
index 00000000..e25af126
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/monticello.meta/categories.st
@@ -0,0 +1 @@
+SystemOrganization addCategory: #'Grease-GemStone330-Core'!
diff --git a/repository/Grease-GemStone330-Core.package/monticello.meta/initializers.st b/repository/Grease-GemStone330-Core.package/monticello.meta/initializers.st
new file mode 100644
index 00000000..e69de29b
diff --git a/repository/Grease-GemStone330-Core.package/monticello.meta/package b/repository/Grease-GemStone330-Core.package/monticello.meta/package
new file mode 100644
index 00000000..e20588a2
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/monticello.meta/package
@@ -0,0 +1 @@
+(name 'Grease-GemStone330-Core')
\ No newline at end of file
diff --git a/repository/Grease-GemStone330-Core.package/monticello.meta/version b/repository/Grease-GemStone330-Core.package/monticello.meta/version
new file mode 100644
index 00000000..8e40562c
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/monticello.meta/version
@@ -0,0 +1 @@
+(name 'Grease-GemStone330-Core-JohanBrichau.1' message 'Fix issue #20: encoding to utf8 breaks in GemStone 3.3+' id 'c907b21a-08ce-4480-86eb-fc2eae297c66' date '10/07/2017' time '06:48:31' author 'JohanBrichau' ancestors () stepChildren ())
\ No newline at end of file
diff --git a/repository/Grease-GemStone330-Core.package/properties.json b/repository/Grease-GemStone330-Core.package/properties.json
new file mode 100644
index 00000000..f037444a
--- /dev/null
+++ b/repository/Grease-GemStone330-Core.package/properties.json
@@ -0,0 +1,2 @@
+{
+	 }