diff --git a/README b/README
index 58b202c..d0a8e4b 100644
--- a/README
+++ b/README
@@ -15,3 +15,9 @@ To build documentation, grab doxygen (http://www.doxygen.org) and run:
   ./make.sh docs
   
 Homepage: http://www.lwithers.me.uk/projects/lw-support/
+
+Requirements
+------------
+
+libutf8++
+  http://www.lwithers.me.uk/projects/libutf8++/
diff --git a/src/docs/.params b/src/docs/.params
new file mode 100644
index 0000000..efd9ae0
--- /dev/null
+++ b/src/docs/.params
@@ -0,0 +1 @@
+doxygen docs docs
diff --git a/src/docs/Doxyfile.in b/src/docs/Doxyfile.in
new file mode 100644
index 0000000..3543c0c
--- /dev/null
+++ b/src/docs/Doxyfile.in
@@ -0,0 +1,146 @@
+# lw-support/src/docs/Doxyfile.in
+#
+#  (c)2006, Laurence Withers, <l@lwithers.me.uk>.
+#  Released under the GNU GPLv2. See file COPYING or
+#  http://www.gnu.org/copyleft/gpl.html for details.
+#
+
+PROJECT_NAME           = lw-support
+OUTPUT_DIRECTORY       =
+CREATE_SUBDIRS         = NO
+OUTPUT_LANGUAGE        = English
+USE_WINDOWS_ENCODING   = NO
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ABBREVIATE_BRIEF       =
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = YES
+FULL_PATH_NAMES        = NO
+STRIP_FROM_PATH        =
+STRIP_FROM_INC_PATH    =
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = NO
+MULTILINE_CPP_IS_BRIEF = YES
+DETAILS_AT_TOP         = YES
+INHERIT_DOCS           = YES
+DISTRIBUTE_GROUP_DOC   = NO
+TAB_SIZE               = 4
+ALIASES                =
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = NO
+SUBGROUPING            = YES
+EXTRACT_ALL            = NO
+EXTRACT_PRIVATE        = NO
+EXTRACT_STATIC         = NO
+EXTRACT_LOCAL_CLASSES  = NO
+EXTRACT_LOCAL_METHODS  = NO
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = YES
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = NO
+CASE_SENSE_NAMES       = YES
+HIDE_SCOPE_NAMES       = NO
+SHOW_INCLUDE_FILES     = NO
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+SORT_BRIEF_DOCS        = NO
+SORT_BY_SCOPE_NAME     = NO
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       =
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = NO
+SHOW_DIRECTORIES       = NO
+FILE_VERSION_FILTER    =
+QUIET                  = YES
+WARNINGS               = YES
+WARN_IF_UNDOCUMENTED   = YES
+WARN_IF_DOC_ERROR      = YES
+WARN_NO_PARAMDOC       = YES
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           =
+FILE_PATTERNS          =
+RECURSIVE              = NO
+EXCLUDE                =
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       =
+EXAMPLE_PATH           =
+EXAMPLE_PATTERNS       =
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             = src/docs
+INPUT_FILTER           =
+FILTER_PATTERNS        =
+FILTER_SOURCE_FILES    = NO
+SOURCE_BROWSER         = NO
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION    = YES
+VERBATIM_HEADERS       = NO
+ALPHABETICAL_INDEX     = YES
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          =
+GENERATE_HTML          = YES
+HTML_OUTPUT            = html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            =
+HTML_FOOTER            =
+HTML_STYLESHEET        =
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = NO
+CHM_FILE               =
+HHC_LOCATION           =
+GENERATE_CHI           = NO
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+DISABLE_INDEX          = NO
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = NO
+TREEVIEW_WIDTH         = 250
+GENERATE_LATEX         = NO
+GENERATE_RTF           = NO
+GENERATE_MAN           = NO
+GENERATE_XML           = NO
+GENERATE_AUTOGEN_DEF   = NO
+GENERATE_PERLMOD       = NO
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = NO
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           =
+INCLUDE_FILE_PATTERNS  =
+PREDEFINED             = DOXYGEN
+EXPAND_AS_DEFINED      =
+SKIP_FUNCTION_MACROS   = YES
+TAGFILES               =
+GENERATE_TAGFILE       =
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+PERL_PATH              = /usr/bin/perl
+CLASS_DIAGRAMS         = YES
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = YES
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+GROUP_GRAPHS           = NO
+UML_LOOK               = NO
+TEMPLATE_RELATIONS     = NO
+INCLUDE_GRAPH          = NO
+INCLUDED_BY_GRAPH      = NO
+CALL_GRAPH             = NO
+GRAPHICAL_HIERARCHY    = YES
+DIRECTORY_GRAPH        = NO
+DOT_IMAGE_FORMAT       = png
+DOT_PATH               =
+DOTFILE_DIRS           =
+MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_HEIGHT   = 1024
+MAX_DOT_GRAPH_DEPTH    = 0
+DOT_TRANSPARENT        = YES
+DOT_MULTI_TARGETS      = YES
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+SEARCHENGINE           = NO
diff --git a/src/docs/MainPage.dox b/src/docs/MainPage.dox
new file mode 100644
index 0000000..7f84bc3
--- /dev/null
+++ b/src/docs/MainPage.dox
@@ -0,0 +1,15 @@
+/* lw-support/src/docs/MainPage.dox
+ *
+ *  (c)2006, Laurence Withers, <l@lwithers.me.uk>.
+ *  Released under the GNU GPLv2. See file COPYING or
+ *  http://www.gnu.org/copyleft/gpl.html for details.
+*/
+
+/*! \mainpage
+
+*/
+
+/* options for text editors
+kate: replace-trailing-space-save true; space-indent true; tab-width 4;
+vim: expandtab:ts=4:sw=4
+*/
diff --git a/src/docs/build.default b/src/docs/build.default
new file mode 100644
index 0000000..ca22639
--- /dev/null
+++ b/src/docs/build.default
@@ -0,0 +1 @@
+source src/docs/build.docs
diff --git a/src/docs/build.docs b/src/docs/build.docs
new file mode 100644
index 0000000..653c323
--- /dev/null
+++ b/src/docs/build.docs
@@ -0,0 +1,43 @@
+# These are external variables, and shouldn't clash with anything else
+#  docs_BUILT
+#
+
+MONOLITHIC_DOC="${MONOLITHIC_DOC} $(echo src/docs/*.dox)"
+build_target monolithic
+
+if [ -z ${docs_BUILT} ]
+then
+    echo "Building documentation with Doxygen..."
+
+    DOXYFILE=obj/Doxyfile.docs
+
+    if [ ! -e ${DOXYFILE} ]
+    then
+        do_cmd cp src/docs/Doxyfile.in ${DOXYFILE} || return 1
+        echo "INPUT = ${MONOLITHIC_DOC}" >> ${DOXYFILE}
+        echo "PROJECT_NUMBER = ${VERSION}" >> ${DOXYFILE}
+    fi
+
+    MODIFIED=0
+    for file in ${MONOLITHIC_DOC}
+    do
+        if [ ${file} -nt html/index.html ]
+        then
+            MODIFIED=1
+            break
+        fi
+    done
+
+    if [ ${MODIFIED} -ne 0 ]
+    then
+        do_cmd doxygen ${DOXYFILE} || return 1
+        print_success "Documentation built"
+    else
+        print_success "Documentation is up to date"
+    fi
+
+    docs_BUILT=1
+fi
+
+# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
+# vim: expandtab:ts=4:sw=4
diff --git a/src/docs/build.install b/src/docs/build.install
new file mode 100644
index 0000000..016c75c
--- /dev/null
+++ b/src/docs/build.install
@@ -0,0 +1 @@
+source src/docs/build.install-docs
diff --git a/src/docs/build.install-docs b/src/docs/build.install-docs
new file mode 100644
index 0000000..66167d3
--- /dev/null
+++ b/src/docs/build.install-docs
@@ -0,0 +1,21 @@
+build_target docs
+
+# create documentation directories
+echo "Installing documentation into ${DOCSDIR}"
+build_dir_tree "${DOCSDIR}/html" || return 1
+
+# copy across the Doxygen-generated documentation
+for file in html/*
+do
+    install_file ${file} ${DOCSDIR}/html 0644 || return 1
+done
+
+# copy across the generic files
+for file in COPYING README
+do
+    install_file ${file} ${DOCSDIR} 0644 || return 1
+done
+
+print_success "Documentation installed"
+# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
+# vim: expandtab:ts=4:sw=4
diff --git a/src/liblw-support/.params b/src/liblw-support/.params
new file mode 100644
index 0000000..e8d4204
--- /dev/null
+++ b/src/liblw-support/.params
@@ -0,0 +1 @@
+c++ lib liblw-support lw-support
diff --git a/src/liblw-support/BottomHeader.h b/src/liblw-support/BottomHeader.h
new file mode 100644
index 0000000..48302a4
--- /dev/null
+++ b/src/liblw-support/BottomHeader.h
@@ -0,0 +1,13 @@
+/* lw-support/src/liblw-support/BottomHeader.h
+ *
+ *  (c)2006, Laurence Withers, <l@lwithers.me.uk>.
+ *  Released under the GNU GPLv2. See file COPYING or
+ *  http://www.gnu.org/copyleft/gpl.html for details.
+*/
+
+#endif
+
+/* options for text editors
+kate: replace-trailing-space-save true; space-indent true; tab-width 4;
+vim: expandtab:ts=4:sw=4
+*/
diff --git a/src/liblw-support/TopHeader.h b/src/liblw-support/TopHeader.h
new file mode 100644
index 0000000..455072a
--- /dev/null
+++ b/src/liblw-support/TopHeader.h
@@ -0,0 +1,16 @@
+/* lw-support/src/liblw-support/TopHeader.h
+ *
+ *  (c)2006, Laurence Withers, <l@lwithers.me.uk>.
+ *  Released under the GNU GPLv2. See file COPYING or
+ *  http://www.gnu.org/copyleft/gpl.html for details.
+*/
+
+#ifndef HEADER_liblw_support
+#define HEADER_liblw_support
+
+// standard includes, or includes needed for type declarations
+
+/* options for text editors
+kate: replace-trailing-space-save true; space-indent true; tab-width 4;
+vim: expandtab:ts=4:sw=4
+*/
diff --git a/src/liblw-support/TopSource.cpp b/src/liblw-support/TopSource.cpp
new file mode 100644
index 0000000..8879a3c
--- /dev/null
+++ b/src/liblw-support/TopSource.cpp
@@ -0,0 +1,15 @@
+/* lw-support/src/liblw-support/TopSource.cpp
+ *
+ *  (c)2006, Laurence Withers, <l@lwithers.me.uk>.
+ *  Released under the GNU GPLv2. See file COPYING or
+ *  http://www.gnu.org/copyleft/gpl.html for details.
+*/
+
+#include "lw-support"
+
+// Below are all the includes used throughout the library.
+
+/* options for text editors
+kate: replace-trailing-space-save true; space-indent true; tab-width 4;
+vim: expandtab:ts=4:sw=4
+*/
diff --git a/src/liblw-support/build.default b/src/liblw-support/build.default
new file mode 100644
index 0000000..3e65d93
--- /dev/null
+++ b/src/liblw-support/build.default
@@ -0,0 +1 @@
+source src/liblw-support/build.lib
diff --git a/src/liblw-support/build.install b/src/liblw-support/build.install
new file mode 100644
index 0000000..4494f58
--- /dev/null
+++ b/src/liblw-support/build.install
@@ -0,0 +1 @@
+source src/liblw-support/build.install-lib
diff --git a/src/liblw-support/build.install-lib b/src/liblw-support/build.install-lib
new file mode 100644
index 0000000..7f2d35d
--- /dev/null
+++ b/src/liblw-support/build.install-lib
@@ -0,0 +1,36 @@
+build_target liblw-support
+
+# make paths (this is for Gentoo in particular)
+build_dir_tree "${LIBDIR}" || return 1
+build_dir_tree "${PKGCONFDIR}" || return 1
+build_dir_tree "${INCLUDEDIR}" || return 1
+
+# install library
+echo "Installing libraries into '${LIBDIR}'"
+install_file ${liblw_support} ${LIBDIR} 0755 || return 1
+BASE="${liblw_support_BASE}.so"
+MAJOR="${BASE}.${SOMAJOR}"
+MINOR="${MAJOR}.${SOMINOR}"
+MICRO="${MINOR}.${SOMICRO}"
+install_symlink "${MINOR}" "${MICRO}" "${LIBDIR}"
+install_symlink "${MAJOR}" "${MINOR}" "${LIBDIR}"
+install_symlink "${BASE}" "${MAJOR}" "${LIBDIR}"
+
+# install header
+echo "Installing header file '${liblw_support_HEADER}' into ${INCLUDEDIR}"
+install_header ${liblw_support_HEADER} ${INCLUDEDIR} 0644 || return 1
+
+# install pkgconfig file
+echo "Installing package config file into ${PKGCONFDIR}"
+PKGCONFFILE=${PKGCONFDIR}/liblw-support.pc
+do_cmd rm -f ${PKGCONFFILE}
+do_cmd_redir ${PKGCONFFILE} sed \
+    -e "s,@VERSION@,${VERSION}," \
+    -e "s,@LIBDIR@,${FINALLIBDIR}," \
+    -e "s,@INCLUDEDIR@,${FINALINCLUDEDIR}," \
+    src/liblw-support/pkgconf.in
+do_cmd chmod 0644 ${PKGCONFFILE}
+print_success "Done"
+
+# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
+# vim: expandtab:ts=4:sw=4
diff --git a/src/liblw-support/build.lib b/src/liblw-support/build.lib
new file mode 100644
index 0000000..f4badfc
--- /dev/null
+++ b/src/liblw-support/build.lib
@@ -0,0 +1,51 @@
+# These are external variables, and shouldn't clash with anything else
+#  liblw_support
+#  liblw_support_BUILT
+#  liblw_support_HEADER
+#  liblw_support_BASE
+
+if [ -z ${liblw_support_BUILT} ]
+then
+    liblw_support_BASE=liblw-support
+    source src/liblw-support/soversion
+
+    liblw_support="obj/${liblw_support_BASE}.so.${SOMAJOR}.${SOMINOR}.${SOMICRO}"
+    SO_EXTRA="$(pkg-config libutf8++ --libs --cflags) -lstdc++ -lc"
+
+    echo "Building library ${liblw_support}..."
+
+    do_cmd source src/liblw-support/build.monolithic || return 1
+
+    MODIFIED=0
+    for test in ${MONOLITHIC_TESTS} ${HDR} ${SRC}
+    do
+        if [ ${test} -nt ${liblw_support} ]
+        then
+            MODIFIED=1
+            break
+        fi
+    done
+
+    if [ ${MODIFIED} -ne 0 ]
+    then
+        echo " Compiling"
+
+        SONAME="${liblw_support_BASE}.so.${SOMAJOR}.${SOMINOR}"
+        do_cmd ${CXX} ${CFLAGS} -Iobj -shared -fpic -o "${liblw_support}" \
+            -Wl,-soname,${SONAME} \
+            ${SRC} ${SO_EXTRA} || return 1
+
+        # make tests work
+        do_cmd ln -sf $(basename ${liblw_support}) obj/${SONAME} || return 1
+
+        print_success "Library built"
+    else
+        print_success "Library up to date"
+    fi
+
+    liblw_support_BUILT=1
+    liblw_support_HEADER=${HDR}
+
+fi
+# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
+# vim: expandtab:ts=4:sw=4
diff --git a/src/liblw-support/build.monolithic b/src/liblw-support/build.monolithic
new file mode 100644
index 0000000..f748426
--- /dev/null
+++ b/src/liblw-support/build.monolithic
@@ -0,0 +1,21 @@
+# These are external variables, and shouldn't clash with anything else
+#  liblw_support_MONOLITHIC
+
+SRC="obj/liblw-support.cpp"
+HDR="obj/lw-support"
+
+MONOLITHIC_TESTS="src/liblw-support/build.lib src/liblw-support/build.monolithic"
+
+if [ -z "${liblw_support_MONOLITHIC}" ]
+then
+    MONOLITHIC_SOURCE="$(echo src/liblw-support/{TopHeader,BottomHeader}.h)"
+    make_monolithic ${HDR} C || return 1
+
+    MONOLITHIC_SOURCE="$(echo src/liblw-support/TopSource.cpp)"
+    make_monolithic ${SRC} C || return 1
+
+    liblw_support_MONOLITHIC=1
+    MONOLITHIC_DOC="${MONOLITHIC_DOC} ${HDR}"
+fi
+# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
+# vim: expandtab:ts=4:sw=4
diff --git a/src/liblw-support/pkgconf.in b/src/liblw-support/pkgconf.in
new file mode 100644
index 0000000..88de235
--- /dev/null
+++ b/src/liblw-support/pkgconf.in
@@ -0,0 +1,21 @@
+# lw-support/src/lib/liblw-support/pkgconf.in
+#
+#  Metadata file for pkg-config
+#  ( http://www.freedesktop.org/software/pkgconfig/ )
+#
+#  (c)2006, Laurence Withers, <l@lwithers.me.uk>.
+#  Released under the GNU GPLv2. See file COPYING or
+#  http://www.gnu.org/copyleft/gpl.html for details.
+#
+
+# Name, description
+Name: lw-support
+Description: Lightweight support library for Linux/C++
+Version: @VERSION@
+
+# Requirements
+Requires: libutf8++
+
+# Compilation information
+Libs: -L@LIBDIR@ -llw-support
+Cflags: -I@INCLUDEDIR@
diff --git a/src/liblw-support/soversion b/src/liblw-support/soversion
new file mode 100644
index 0000000..1ad672a
--- /dev/null
+++ b/src/liblw-support/soversion
@@ -0,0 +1,17 @@
+# lw-support/src/liblw-support/soversion
+#
+#  (c)2006, Laurence Withers, <l@lwithers.me.uk>.
+#  Released under the GNU GPLv2. See file COPYING or
+#  http://www.gnu.org/copyleft/gpl.html for details.
+#
+
+
+
+# SOMAJOR and SOMINOR are included in the library's soname. They need to
+# be bumped on a binary-incompatible release. They are both single
+# integers.
+SOMAJOR=0
+SOMINOR=0
+
+# SOMICRO is bumped every time there is a binary-compatible release.
+SOMICRO=0
diff --git a/src/tests/.params b/src/tests/.params
new file mode 100644
index 0000000..3bf417f
--- /dev/null
+++ b/src/tests/.params
@@ -0,0 +1 @@
+c++ tests tests liblw-support
diff --git a/src/tests/build.default b/src/tests/build.default
new file mode 100644
index 0000000..2d979e2
--- /dev/null
+++ b/src/tests/build.default
@@ -0,0 +1,3 @@
+source src/tests/build.tests
+# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
+# vim: expandtab:ts=4:sw=4
diff --git a/src/tests/build.tests b/src/tests/build.tests
new file mode 100644
index 0000000..5273980
--- /dev/null
+++ b/src/tests/build.tests
@@ -0,0 +1,43 @@
+# These are external variables, and shouldn't clash with anything else
+#  tests_BUILT
+#
+
+build_target liblw-support || return 1
+
+if [ -z ${tests_BUILT} ]
+then
+    LIBS="${liblw_support} "
+    EXTRAS=""
+
+    echo "Building test programs..."
+    do_cmd mkdir -p obj/tests || return 1
+
+    for SRC in src/tests/*.cpp
+    do
+        TEST="obj/tests/$(basename ${SRC} | sed -e 's,.cpp$,,')"
+        MODIFIED=0
+        for file in ${LIBS} ${SRC} src/tests/build.tests
+        do
+            if [ ${file} -nt ${TEST} ]
+            then
+                MODIFIED=1
+                break
+            fi
+        done
+
+        if [ ${MODIFIED} -ne 0 ]
+        then
+            do_cmd ${CXX} -Iobj ${CFLAGS} -o ${TEST} ${SRC} ${LIBS} ${EXTRAS} || return 1
+            print_success "Built ${TEST}"
+        else
+            print_success "${TEST} is up to date"
+        fi
+    done
+
+    print_success "All tests built"
+
+    tests_BUILT=1
+fi
+
+# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
+# vim: expandtab:ts=4:sw=4
diff --git a/src/tests/template b/src/tests/template
new file mode 100644
index 0000000..06445d9
--- /dev/null
+++ b/src/tests/template
@@ -0,0 +1,44 @@
+/* lw-support/src/tests/???.cpp
+ *
+ *  (c)2006, Laurence Withers, <l@lwithers.me.uk>.
+ *  Released under the GNU GPLv2. See file COPYING or
+ *  http://www.gnu.org/copyleft/gpl.html for details.
+*/
+
+#include "lw-support"
+
+#include <iostream>
+
+
+
+int main(int argc, char* argv[])
+{
+    if(argc == 2 && !strcmp(argv[1], "--print-summary")) {
+        std::cout << "One line summary.\n";
+        return 0;
+    }
+
+    if(argc == 1) {
+        // empty argument list
+    }
+
+    int ret = 0;
+    try {
+        // TODO
+    }
+    catch(std::exception& e) {
+        std::cerr << e.what() << std::endl;
+        ret = 1;
+    }
+    catch(...) {
+        std::cerr << "Unknown exception caught." << std::endl;
+        ret = 1;
+    }
+
+    return ret;
+}
+
+/* options for text editors
+kate: replace-trailing-space-save true; space-indent true; tab-width 4;
+vim: expandtab:ts=4:sw=4
+*/