diff --git a/src/include/v3270.h b/src/include/v3270.h
index ac1302b..4e28a87 100644
--- a/src/include/v3270.h
+++ b/src/include/v3270.h
@@ -287,7 +287,7 @@
  LIB3270_EXPORT int				  v3270_print_selected(GtkWidget *widget, GError **error);
  LIB3270_EXPORT int				  v3270_print_copy(GtkWidget *widget, GError **error);
 
- LIB3270_EXPORT void			  v3270_exec_command(GtkWidget *widget, const gchar *cmdline);
+ LIB3270_EXPORT int				  v3270_exec_command(GtkWidget *widget, const gchar *cmdline);
 
  LIB3270_EXPORT GtkWidget		* v3270_dialog_new(const gchar *title, GtkWindow *parent, const gchar *apply);
 
diff --git a/src/trace/exec.c b/src/trace/exec.c
index afcb632..13b50c9 100644
--- a/src/trace/exec.c
+++ b/src/trace/exec.c
@@ -34,6 +34,7 @@
 
  #include <libintl.h>
  #include <glib/gi18n.h>
+ #include <stdlib.h>
 
  #include <lib3270.h>
  #include <lib3270/log.h>
@@ -58,53 +59,92 @@
  	return rc;
  }
 
- static void set_property(H3270 *hSession, gchar *ptr)
+ static int set_property(H3270 *hSession, const gchar *name, const gchar * value)
  {
  	size_t ix;
 
- 	const gchar * name = get_word(&ptr);
-
- 	debug("property_name: \"%s\"",name);
+ 	debug("%s=%s",name,value);
 
  	// Check toggles
  	for(ix = 0; ix < (size_t) LIB3270_TOGGLE_COUNT; ix++)
 	{
-		debug("%s %s %d",name,lib3270_get_toggle_name((LIB3270_TOGGLE) ix),g_ascii_strcasecmp(name,lib3270_get_toggle_name((LIB3270_TOGGLE) ix)));
 		if(g_ascii_strcasecmp(name,lib3270_get_toggle_name((LIB3270_TOGGLE) ix)) == 0)
-		{
-			lib3270_set_toggle(hSession,(LIB3270_TOGGLE) ix, 1);
-			return;
-		}
+			return lib3270_set_toggle(hSession,(LIB3270_TOGGLE) ix, atoi(value));
+
 	}
 
  	// Check boolean properties
- 	const LIB3270_INT_PROPERTY * iProp = lib3270_get_boolean_properties_list();
+ 	const LIB3270_INT_PROPERTY * bProp = lib3270_get_boolean_properties_list();
+ 	for(ix = 0; bProp[ix].name; ix++)
+	{
+		if(g_ascii_strcasecmp(name,bProp[ix].name) == 0 && bProp[ix].set)
+			return bProp[ix].set(hSession,atoi(value));
+
+	}
+
+	// Check integer properties
+ 	const LIB3270_INT_PROPERTY * iProp = lib3270_get_int_properties_list();
  	for(ix = 0; iProp[ix].name; ix++)
 	{
-		debug("%s %s %d",name,iProp[ix].name,g_ascii_strcasecmp(name,iProp[ix].name));
 		if(g_ascii_strcasecmp(name,iProp[ix].name) == 0 && iProp[ix].set)
-		{
-			iProp[ix].set(hSession,1);
-			return;
-		}
+			return iProp[ix].set(hSession,atoi(value));
+
 	}
 
+	// Check string properties
+	const LIB3270_STRING_PROPERTY * sProp = lib3270_get_string_properties_list();
+ 	for(ix = 0; sProp[ix].name; ix++)
+	{
+		if(g_ascii_strcasecmp(name,sProp[ix].name) == 0 && sProp[ix].set)
+			return sProp[ix].set(hSession,value);
 
+	}
+
+	return errno = ENOENT;
 
  }
 
- void v3270_exec_command(GtkWidget *widget, const gchar *text)
+ int v3270_exec_command(GtkWidget *widget, const gchar *text)
  {
+ 	H3270 *hSession = v3270_get_session(widget);
 	g_autofree gchar * cmdline = g_strdup(text);
 
  	g_strstrip(cmdline);
 
  	debug("cmdline: \"%s\"",cmdline);
 
- 	if(g_str_has_prefix(cmdline,"set "))
+ 	if(g_str_has_prefix(cmdline,"connect"))
+	{
+		return lib3270_reconnect(hSession,0);
+	}
+
+ 	if(g_str_has_prefix(cmdline,"disconnect"))
+	{
+		return lib3270_disconnect(hSession);
+	}
+
+ 	if(g_str_has_prefix(cmdline,"set"))
+	{
+		gchar *txtptr = cmdline+3;
+		const gchar * name = get_word(&txtptr);
+		g_strstrip(txtptr);
+		return set_property(hSession,name,(*txtptr ? txtptr : "1"));
+	}
+
+ 	if(g_str_has_prefix(cmdline,"reset"))
+	{
+		gchar *txtptr = cmdline+3;
+		const gchar * name = get_word(&txtptr);
+		g_strstrip(txtptr);
+		return set_property(hSession,name,(*txtptr ? txtptr : "0"));
+	}
+
+	gchar * sep = strchr(cmdline,'=');
+	if(sep)
 	{
-		set_property(v3270_get_session(widget), cmdline+3);
-		return;
+		*(sep++) = 0;
+		set_property(hSession,g_strstrip(cmdline),g_strstrip(sep));
 	}
 
+	return errno = ENOENT;
  }
diff --git a/src/trace/trace.c b/src/trace/trace.c
index 4b06104..d9b4a15 100644
--- a/src/trace/trace.c
+++ b/src/trace/trace.c
@@ -166,7 +166,11 @@ static void destroy(GtkWidget *widget)
 
  static void activate(G_GNUC_UNUSED GtkButton *button, v3270_trace *window)
  {
-	v3270_exec_command(GTK_WIDGET(window),gtk_entry_get_text(GTK_ENTRY(window->entry)));
+	GtkWidget * terminal = GTK_WIDGET(lib3270_get_user_data(window->hSession));
+
+	int rc = v3270_exec_command(terminal,gtk_entry_get_text(GTK_ENTRY(window->entry)));
+
+	v3270_trace_printf(GTK_WIDGET(window),"exec(\"%s\") exits with rc=%d (%s)\n",gtk_entry_get_text(GTK_ENTRY(window->entry)),rc,strerror(rc));
 	gtk_entry_set_text(GTK_ENTRY(window->entry),"");
  }
 
diff --git a/v3270.cbp b/v3270.cbp
index ee44929..7130807 100644
--- a/v3270.cbp
+++ b/v3270.cbp
@@ -74,123 +74,126 @@
 		<Unit filename="src/dialogs/tools.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/include/config.h" />
-		<Unit filename="src/include/config.h.in" />
-		<Unit filename="src/include/hostselect.h" />
-		<Unit filename="src/include/internals.h" />
-		<Unit filename="src/include/v3270.h" />
-		<Unit filename="src/include/v3270/colorscheme.h" />
-		<Unit filename="src/include/v3270/filetransfer.h" />
-		<Unit filename="src/include/v3270/ftprogress.h" />
-		<Unit filename="src/include/v3270/print.h" />
-		<Unit filename="src/include/v3270/trace.h" />
-		<Unit filename="src/testprogram/testprogram.c">
+		<Unit filename="src/filetransfer/activity.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/trace/trace.c">
+		<Unit filename="src/filetransfer/activitylist.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270/accessible.c">
+		<Unit filename="src/filetransfer/dialog.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270/blink.c">
+		<Unit filename="src/filetransfer/filelist.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270/callbacks.c">
+		<Unit filename="src/filetransfer/get.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270/charset.c">
+		<Unit filename="src/filetransfer/load.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270/colors.c">
+		<Unit filename="src/filetransfer/marshal.h" />
+		<Unit filename="src/filetransfer/misc.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270/draw.c">
+		<Unit filename="src/filetransfer/private.h" />
+		<Unit filename="src/filetransfer/save.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270/font.c">
+		<Unit filename="src/filetransfer/select.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270/iocallback.c">
+		<Unit filename="src/filetransfer/set.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270/keyboard.c">
+		<Unit filename="src/filetransfer/settings.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270/linux/iosource.c">
+		<Unit filename="src/filetransfer/tables.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270/macros.c">
+		<Unit filename="src/filetransfer/transfer.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270/mouse.c">
+		<Unit filename="src/filetransfer/v3270ft.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270/oia.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="src/v3270/private.h" />
-		<Unit filename="src/v3270/properties.c">
+		<Unit filename="src/filetransfer/v3270ftprogress.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270/security.c">
+		<Unit filename="src/include/config.h" />
+		<Unit filename="src/include/config.h.in" />
+		<Unit filename="src/include/hostselect.h" />
+		<Unit filename="src/include/internals.h" />
+		<Unit filename="src/include/v3270.h" />
+		<Unit filename="src/include/v3270/accessible.h" />
+		<Unit filename="src/include/v3270/colorscheme.h" />
+		<Unit filename="src/include/v3270/filetransfer.h" />
+		<Unit filename="src/include/v3270/ftprogress.h" />
+		<Unit filename="src/include/v3270/print.h" />
+		<Unit filename="src/include/v3270/trace.h" />
+		<Unit filename="src/terminal/accessible.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270/selection.c">
+		<Unit filename="src/terminal/blink.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270/widget.c">
+		<Unit filename="src/terminal/callbacks.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270/windows/iosource.c">
+		<Unit filename="src/terminal/charset.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270ft/activity.c">
+		<Unit filename="src/terminal/colors.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270ft/activitylist.c">
+		<Unit filename="src/terminal/draw.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270ft/dialog.c">
+		<Unit filename="src/terminal/font.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270ft/filelist.c">
+		<Unit filename="src/terminal/iocallback.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270ft/get.c">
+		<Unit filename="src/terminal/keyboard.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270ft/load.c">
+		<Unit filename="src/terminal/linux/iosource.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270ft/misc.c">
+		<Unit filename="src/terminal/marshal.h" />
+		<Unit filename="src/terminal/oia.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270ft/private.h" />
-		<Unit filename="src/v3270ft/save.c">
+		<Unit filename="src/terminal/private.h" />
+		<Unit filename="src/terminal/properties.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270ft/select.c">
+		<Unit filename="src/terminal/security.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270ft/set.c">
+		<Unit filename="src/terminal/selection.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270ft/settings.c">
+		<Unit filename="src/terminal/widget.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270ft/tables.c">
+		<Unit filename="src/terminal/windows/iosource.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270ft/transfer.c">
+		<Unit filename="src/terminal/windows/resources.rc" />
+		<Unit filename="src/testprogram/testprogram.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270ft/v3270ft.c">
+		<Unit filename="src/trace/exec.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/v3270ft/v3270ftprogress.c">
+		<Unit filename="src/trace/trace.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="src/v3270/private.h" />
+		<Unit filename="src/v3270ft/private.h" />
 		<Extensions>
 			<code_completion />
 			<envvars />
--
libgit2 0.21.2