diff --git a/TODO b/TODO
index a1b124228..517980586 100644
--- a/TODO
+++ b/TODO
@@ -88,8 +88,6 @@ Some of the things (in very short form) that need to be done to E17...
 * add a "taskbar" module
 * add cpu load module
 * add setup/install wizard to seed .desktop files etc. etc.
-* finish clientinfo dialog for borders (netwm props etc. etc.)
-* gui config dialogs for all config
 * make it possible to disable border buttons/actions (tell theme what is
   disabled) like close, maximize, etc. etc. buttons.
 ]]]
diff --git a/configure.in b/configure.in
index 194db15a9..1f1de4f47 100644
--- a/configure.in
+++ b/configure.in
@@ -260,6 +260,8 @@ src/modules/winlist/Makefile
 src/modules/winlist/module.desktop
 src/modules/fileman/Makefile
 src/modules/fileman/module.desktop
+src/modules/wizard/Makefile
+src/modules/wizard/module.desktop
 src/modules/conf/Makefile
 src/modules/conf/module.desktop
 src/modules/conf_wallpaper/Makefile
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index 7cf4c8be9..0c314ab0b 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -13,6 +13,7 @@ layout \
 exebuf \
 winlist \
 fileman \
+wizard \
 conf \
 conf_wallpaper \
 conf_theme \
diff --git a/src/modules/wizard/Makefile.am b/src/modules/wizard/Makefile.am
new file mode 100644
index 000000000..e2dae5efd
--- /dev/null
+++ b/src/modules/wizard/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = wizard
+
+# data files for the module
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)
+files_DATA = \
+e-module-$(MODULE).edj module.desktop
+
+EXTRA_DIST = $(files_DATA)
+
+# the module .so file
+INCLUDES               = -I. \
+                         -I$(top_srcdir) \
+                         -I$(top_srcdir)/src/modules/$(MODULE) \
+                         -I$(top_srcdir)/src/bin \
+                         -I$(top_srcdir)/src/lib \
+                         -I$(top_srcdir)/src/modules \
+                         @e_cflags@
+pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
+pkg_LTLIBRARIES        = module.la
+module_la_SOURCES      = e_mod_main.c \
+                         e_mod_main.h \
+			 e_wizard.c \
+                         e_wizard.h
+			 
+module_la_LIBADD       = @e_libs@ @dlopen_libs@
+module_la_LDFLAGS      = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/wizard/e-module-wizard.edj b/src/modules/wizard/e-module-wizard.edj
new file mode 100644
index 000000000..64e7dd38c
Binary files /dev/null and b/src/modules/wizard/e-module-wizard.edj differ
diff --git a/src/modules/wizard/e_mod_main.c b/src/modules/wizard/e_mod_main.c
new file mode 100644
index 000000000..3f6bcc19d
--- /dev/null
+++ b/src/modules/wizard/e_mod_main.c
@@ -0,0 +1,60 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#include "e.h"
+#include "e_mod_main.h"
+
+/***************************************************************************/
+/**/
+/* actual module specifics */
+
+static E_Module *conf_module = NULL;
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+/* module setup */
+EAPI E_Module_Api e_modapi =
+{
+   E_MODULE_API_VERSION,
+     "Wizard"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   conf_module = m;
+   e_wizard_init();
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m)
+{
+   e_wizard_shutdown();
+   conf_module = NULL;
+   return 1;
+}
+
+EAPI int
+e_modapi_save(E_Module *m)
+{
+   return 1;
+}
+
+EAPI int
+e_modapi_about(E_Module *m)
+{
+   e_module_dialog_show(m,
+			_("Enlightenment First Run Wizard Module"),
+			_("A module for setting up configuration for Enlightenment for the first time."));
+   return 1;
+}
diff --git a/src/modules/wizard/e_mod_main.h b/src/modules/wizard/e_mod_main.h
new file mode 100644
index 000000000..6ae4e32a3
--- /dev/null
+++ b/src/modules/wizard/e_mod_main.h
@@ -0,0 +1,21 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+#define E_TYPEDEFS 1
+#include "e_wizard.h"
+
+#undef E_TYPEDEFS
+#include "e_wizard.h"
+
+
+EAPI extern E_Module_Api e_modapi;
+
+EAPI void *e_modapi_init     (E_Module *m);
+EAPI int   e_modapi_shutdown (E_Module *m);
+EAPI int   e_modapi_save     (E_Module *m);
+EAPI int   e_modapi_about    (E_Module *m);
+
+#endif
diff --git a/src/modules/wizard/e_wizard.c b/src/modules/wizard/e_wizard.c
new file mode 100644
index 000000000..776c8665e
--- /dev/null
+++ b/src/modules/wizard/e_wizard.c
@@ -0,0 +1,17 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#include "e.h"
+#include "e_mod_main.h"
+
+EAPI int
+e_wizard_init(void)
+{
+   return 1;
+}
+
+EAPI int
+e_wizard_shutdown(void)
+{
+   return 1;
+}
diff --git a/src/modules/wizard/e_wizard.h b/src/modules/wizard/e_wizard.h
new file mode 100644
index 000000000..87f0eec1c
--- /dev/null
+++ b/src/modules/wizard/e_wizard.h
@@ -0,0 +1,14 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#ifdef E_TYPEDEFS
+
+#else
+#ifndef E_WIZARD_H
+#define E_WIZARD_H
+
+EAPI int e_wizard_init(void);
+EAPI int e_wizard_shutdown(void);
+
+#endif
+#endif
diff --git a/src/modules/wizard/module.desktop.in b/src/modules/wizard/module.desktop.in
new file mode 100644
index 000000000..f33f3153d
--- /dev/null
+++ b/src/modules/wizard/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=First Run Wizard
+Icon=e-module-wizard