21 files changed, 1444 insertions, 2637 deletions
diff --git a/Doxyfile b/Doxyfile
index 23de8ba..33a33f6 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -1,105 +1,20 @@
-# Doxyfile 1.8.1
+# Doxyfile 1.9.4
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a hash (#) is considered a comment and will be ignored.
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ").
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
 DOXYFILE_ENCODING      = UTF-8
-# The PROJECT_NAME tag is a single word (or sequence of words) that should
-# identify the project. Note that if you do not use Doxywizard you need
-# to put quotes around the project name if it contains spaces.
 PROJECT_NAME           = libbu++
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
 PROJECT_NUMBER         = $VERSION$
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer
-# a quick idea about the purpose of the project. Keep the description short.
 PROJECT_BRIEF          =
-# With the PROJECT_LOGO tag one can specify an logo or icon that is
-# included in the documentation. The maximum height of the logo should not
-# exceed 55 pixels and the maximum width should not exceed 200 pixels.
-# Doxygen will copy the logo to the output directory.
 PROJECT_LOGO           =
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
 OUTPUT_DIRECTORY       = api
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
 CREATE_SUBDIRS         = NO
+CREATE_SUBDIRS_LEVEL   = 8
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+ALLOW_UNICODE_NAMES    = NO
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
 OUTPUT_LANGUAGE        = English
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
 BRIEF_MEMBER_DESC      = YES
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
 REPEAT_BRIEF           = YES
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
 ABBREVIATE_BRIEF       = "The $name class" \
                         "The $name widget" \
                         "The $name file" \
@@ -111,582 +26,107 @@ ABBREVIATE_BRIEF       = "The $name class" \
                         a \
                         an \
                         the
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
 ALWAYS_DETAILED_SEC    = NO
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
 INLINE_INHERITED_MEMB  = NO
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
 FULL_PATH_NAMES        = NO
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip.
 STRIP_FROM_PATH        =
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
 STRIP_FROM_INC_PATH    =
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful if your file system
-# doesn't support long names like on DOS, Mac, or CD-ROM.
 SHORT_NAMES            = NO
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
-# (thus requiring an explicit @brief command for a brief description.)
 JAVADOC_AUTOBRIEF      = YES
+JAVADOC_BANNER         = NO
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
-# an explicit \brief command for a brief description.)
 QT_AUTOBRIEF           = NO
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
 MULTILINE_CPP_IS_BRIEF = NO
+PYTHON_DOCSTRING       = YES
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
 INHERIT_DOCS           = YES
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
 SEPARATE_MEMBER_PAGES  = NO
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
 TAB_SIZE               = 4
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
 ALIASES                =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding
-# "class=itcl::class" will allow you to use the command class in the
-# itcl::class meaning.
-TCL_SUBST              =
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
 OPTIMIZE_OUTPUT_FOR_C  = NO
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for
-# Java. For instance, namespaces will be presented as packages, qualified
-# scopes will look different, etc.
 OPTIMIZE_OUTPUT_JAVA   = NO
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources only. Doxygen will then generate output that is more tailored for
-# Fortran.
 OPTIMIZE_FOR_FORTRAN   = NO
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for
-# VHDL.
 OPTIMIZE_OUTPUT_VHDL   = NO
+OPTIMIZE_OUTPUT_SLICE  = NO
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given extension.
-# Doxygen has a built-in mapping, but you can override or extend it using this
-# tag. The format is ext=language, where ext is a file extension, and language
-# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C,
-# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make
-# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
-# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions
-# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
 EXTENSION_MAPPING      =
-# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
-# comments according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you
-# can mix doxygen, HTML, and XML commands with Markdown formatting.
-# Disable only in case of backward compatibilities issues.
 MARKDOWN_SUPPORT       = YES
+TOC_INCLUDE_HEADINGS   = 5
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+AUTOLINK_SUPPORT       = YES
-# to include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also makes the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
 BUILTIN_STL_SUPPORT    = NO
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
 CPP_CLI_SUPPORT        = NO
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-# Doxygen will parse them like normal C++ but will assume all classes use public
-# instead of private inheritance when no explicit protection keyword is present.
 SIP_SUPPORT            = NO
-# For Microsoft's IDL there are propget and propput attributes to indicate getter
-# and setter methods for a property. Setting this option to YES (the default)
-# will make doxygen replace the get and set methods by a property in the
-# documentation. This will only work if the methods are indeed getting or
-# setting a simple type. If this is not the case, or you want to show the
-# methods anyway, you should set this option to NO.
 IDL_PROPERTY_SUPPORT   = YES
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
 DISTRIBUTE_GROUP_DOC   = NO
+GROUP_NESTED_COMPOUNDS = NO
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
 SUBGROUPING            = YES
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
-# unions are shown inside the group in which they are included (e.g. using
-# @ingroup) instead of on a separate page (for HTML and Man pages) or
-# section (for LaTeX and RTF).
 INLINE_GROUPED_CLASSES = NO
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
-# unions with only public data fields will be shown inline in the documentation
-# of the scope in which they are defined (i.e. file, namespace, or group
-# documentation), provided this scope is documented. If set to NO (the default),
-# structs, classes, and unions are shown on a separate page (for HTML and Man
-# pages) or section (for LaTeX and RTF).
 INLINE_SIMPLE_STRUCTS  = NO
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
-# is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically
-# be useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
 TYPEDEF_HIDES_STRUCT   = NO
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penalty.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will roughly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols.
-SYMBOL_CACHE_SIZE      = 0
-# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
-# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
-# their name and scope. Since this can be an expensive process and often the
-# same symbol appear multiple times in the code, doxygen keeps a cache of
-# pre-resolved symbols. If the cache is too small doxygen will become slower.
-# If the cache is too large, memory is wasted. The cache size is given by this
-# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols.
 LOOKUP_CACHE_SIZE      = 0
+NUM_PROC_THREADS       = 1
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
 EXTRACT_ALL            = YES
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
 EXTRACT_PRIVATE        = YES
+EXTRACT_PRIV_VIRTUAL   = YES
-# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal scope will be included in the documentation.
+EXTRACT_PACKAGE        = YES
-EXTRACT_PACKAGE        = NO
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
 EXTRACT_STATIC         = YES
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
 EXTRACT_LOCAL_CLASSES  = YES
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
 EXTRACT_LOCAL_METHODS  = YES
+EXTRACT_ANON_NSPACES   = YES
-# If this flag is set to YES, the members of anonymous namespaces will be
+RESOLVE_UNNAMED_PARAMS = YES
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base
-# name of the file that contains the anonymous namespace. By default
-# anonymous namespaces are hidden.
-EXTRACT_ANON_NSPACES   = NO
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
 HIDE_UNDOC_MEMBERS     = NO
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
 HIDE_UNDOC_CLASSES     = NO
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
 HIDE_FRIEND_COMPOUNDS  = NO
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
 HIDE_IN_BODY_DOCS      = NO
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
 INTERNAL_DOCS          = YES
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
 CASE_SENSE_NAMES       = YES
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
 HIDE_SCOPE_NAMES       = NO
+HIDE_COMPOUND_REFERENCE= NO
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+SHOW_HEADERFILE        = YES
-# will put a list of the files that are included by a file in the documentation
-# of that file.
 SHOW_INCLUDE_FILES     = YES
+SHOW_GROUPED_MEMB_INC  = NO
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
-# will list include files with double quotes in the documentation
-# rather than with sharp brackets.
 FORCE_LOCAL_INCLUDES   = NO
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
 INLINE_INFO            = YES
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
 SORT_MEMBER_DOCS       = YES
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
 SORT_BRIEF_DOCS        = NO
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
-# will sort the (brief and detailed) documentation of class members so that
-# constructors and destructors are listed first. If set to NO (the default)
-# the constructors will appear in the respective orders defined by
-# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
-# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
-# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
 SORT_MEMBERS_CTORS_1ST = NO
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
-# hierarchy of group names into alphabetical order. If set to NO (the default)
-# the group names will appear in their defined order.
 SORT_GROUP_NAMES       = NO
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
 SORT_BY_SCOPE_NAME     = NO
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
-# do proper type resolution of all parameters of a function it will reject a
-# match between the prototype and the implementation of a member function even
-# if there is only one candidate or it is obvious which candidate to choose
-# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
-# will still accept a match between prototype and implementation in such cases.
 STRICT_PROTO_MATCHING  = NO
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
 GENERATE_TODOLIST      = YES
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
 GENERATE_TESTLIST      = YES
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
 GENERATE_BUGLIST       = YES
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
 GENERATE_DEPRECATEDLIST= YES
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
 ENABLED_SECTIONS       =
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or macro consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and macros in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
 MAX_INITIALIZER_LINES  = 30
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
 SHOW_USED_FILES        = YES
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
-# This will remove the Files entry from the Quick Index and from the
-# Folder Tree View (if specified). The default is YES.
 SHOW_FILES             = YES
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
-# Namespaces page.
-# This will remove the Namespaces entry from the Quick Index
-# and from the Folder Tree View (if specified). The default is YES.
 SHOW_NAMESPACES        = YES
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command <command> <input-file>, where <command> is the value of
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
-# is used as the file version. See the manual for examples.
 FILE_VERSION_FILTER    =
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. The create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option.
-# You can optionally specify a file name after the option, if omitted
-# DoxygenLayout.xml will be used as the name of the layout file.
 LAYOUT_FILE            =
-# The CITE_BIB_FILES tag can be used to specify one or more bib files
-# containing the references data. This must be a list of .bib files. The
-# .bib extension is automatically appended if omitted. Using this command
-# requires the bibtex tool to be installed. See also
-# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
-# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
-# feature you need bibtex and perl available in the search path.
 CITE_BIB_FILES         =
 #---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
+# Configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
 QUIET                  = NO
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
 WARNINGS               = YES
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
 WARN_IF_UNDOCUMENTED   = YES
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
 WARN_IF_DOC_ERROR      = YES
+WARN_IF_INCOMPLETE_DOC = YES
-# The WARN_NO_PARAMDOC option can be enabled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
-# documentation.
 WARN_NO_PARAMDOC       = YES
+WARN_AS_ERROR          = NO
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
-# be obtained via FILE_VERSION_FILTER)
 WARN_FORMAT            = "$file:$line: $text"
+WARN_LINE_FORMAT       = "at line $line of file $file"
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
 WARN_LOGFILE           = Doxywarn
 #---------------------------------------------------------------------------
-# configuration options related to the input files
+# Configuration options related to the input files
 #---------------------------------------------------------------------------
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
 INPUT                  = src \
                         src/doxy \
                         src/stable \
                         src/unstable \
                         src/experimental
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-# also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
-# the list of possible encodings.
 INPUT_ENCODING         = UTF-8
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
-# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
-# *.f90 *.f *.for *.vhd *.vhdl
 FILE_PATTERNS          = *.c \
                         *.cc \
                         *.cxx \
@@ -733,1119 +173,225 @@ FILE_PATTERNS          = *.c \
                         *.moc \
                         *.xpm \
                         *.dox
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
 RECURSIVE              = NO
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
 EXCLUDE                =
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
 EXCLUDE_SYMLINKS       = NO
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
-# for example use the pattern */test/*
 EXCLUDE_PATTERNS       =
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
 EXCLUDE_SYMBOLS        =
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
 EXAMPLE_PATH           =
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
 EXAMPLE_PATTERNS       = *
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
 EXAMPLE_RECURSIVE      = NO
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
 IMAGE_PATH             =
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.
-# If FILTER_PATTERNS is specified, this tag will be
-# ignored.
 INPUT_FILTER           =
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.
-# Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.
-# The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty or if
-# non of the patterns match the file name, INPUT_FILTER is applied.
 FILTER_PATTERNS        =
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
 FILTER_SOURCE_FILES    = NO
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
-# and it is also possible to disable source filtering for a specific pattern
-# using *.ext= (so without naming a filter). This option only has effect when
-# FILTER_SOURCE_FILES is enabled.
 FILTER_SOURCE_PATTERNS =
+USE_MDFILE_AS_MAINPAGE =
 #---------------------------------------------------------------------------
-# configuration options related to source browsing
+# Configuration options related to source browsing
 #---------------------------------------------------------------------------
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO.
 SOURCE_BROWSER         = YES
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
 INLINE_SOURCES         = NO
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
 STRIP_CODE_COMMENTS    = YES
-# If the REFERENCED_BY_RELATION tag is set to YES
-# then for each documented function all documented
-# functions referencing it will be listed.
 REFERENCED_BY_RELATION = YES
-# If the REFERENCES_RELATION tag is set to YES
-# then for each documented function all documented entities
-# called/used by that function will be listed.
 REFERENCES_RELATION    = YES
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code.
-# Otherwise they will link to the documentation.
 REFERENCES_LINK_SOURCE = YES
+SOURCE_TOOLTIPS        = YES
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
-# will need version 4.8.6 or higher.
 USE_HTAGS              = NO
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
 VERBATIM_HEADERS       = YES
+CLANG_ASSISTED_PARSING = YES
+CLANG_ADD_INC_PATHS    = YES
+CLANG_OPTIONS          =
+CLANG_DATABASE_PATH    =
 #---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
+# Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
 ALPHABETICAL_INDEX     = YES
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
-COLS_IN_ALPHA_INDEX    = 4
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
 IGNORE_PREFIX          =
 #---------------------------------------------------------------------------
-# configuration options related to the HTML output
+# Configuration options related to the HTML output
 #---------------------------------------------------------------------------
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
 GENERATE_HTML          = YES
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
 HTML_OUTPUT            = html
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
 HTML_FILE_EXTENSION    = .html
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header. Note that when using a custom header you are responsible
-#  for the proper inclusion of any scripts and style sheets that doxygen
-# needs, which is dependent on the configuration options used.
-# It is advised to generate a default header using "doxygen -w html
-# header.html footer.html stylesheet.css YourConfigFile" and then modify
-# that header. Note that the header is subject to change so you typically
-# have to redo this when upgrading to a newer version of doxygen or when
-# changing the value of configuration settings such as GENERATE_TREEVIEW!
 HTML_HEADER            =
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
 HTML_FOOTER            =
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
-# style sheet in the HTML output directory as well, or it will be erased!
 HTML_STYLESHEET        =
+HTML_EXTRA_STYLESHEET  =
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that
-# the files will be copied as-is; there are no commands or markers available.
 HTML_EXTRA_FILES       =
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
-# Doxygen will adjust the colors in the style sheet and background images
-# according to this color. Hue is specified as an angle on a colorwheel,
-# see http://en.wikipedia.org/wiki/Hue for more information.
-# For instance the value 0 represents red, 60 is yellow, 120 is green,
-# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
-# The allowed range is 0 to 359.
 HTML_COLORSTYLE_HUE    = 220
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
-# the colors in the HTML output. For a value of 0 the output will use
-# grayscales only. A value of 255 will produce the most vivid colors.
 HTML_COLORSTYLE_SAT    = 100
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
-# the luminance component of the colors in the HTML output. Values below
-# 100 gradually make the output lighter, whereas values above 100 make
-# the output darker. The value divided by 100 is the actual gamma applied,
-# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
-# and 100 does not change the gamma.
 HTML_COLORSTYLE_GAMMA  = 80
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting
-# this to NO can help when comparing the output of multiple runs.
 HTML_TIMESTAMP         = YES
+HTML_DYNAMIC_MENUS     = YES
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
 HTML_DYNAMIC_SECTIONS  = YES
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
-# entries shown in the various tree structured indices initially; the user
-# can expand and collapse entries dynamically later on. Doxygen will expand
-# the tree to such a level that at most the specified number of entries are
-# visible (unless a fully collapsed tree already exceeds this amount).
-# So setting the number of entries 1 will produce a full collapsed tree by
-# default. 0 is a special value representing an infinite number of entries
-# and will result in a full expanded tree by default.
 HTML_INDEX_NUM_ENTRIES = 100
-# If the GENERATE_DOCSET tag is set to YES, additional index files
-# will be generated that can be used as input for Apple's Xcode 3
-# integrated development environment, introduced with OSX 10.5 (Leopard).
-# To create a documentation set, doxygen will generate a Makefile in the
-# HTML output directory. Running make will produce the docset in that
-# directory and running "make install" will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
-# it at startup.
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
 GENERATE_DOCSET        = NO
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
-# feed. A documentation feed provides an umbrella under which multiple
-# documentation sets from a single provider (such as a company or product suite)
-# can be grouped.
 DOCSET_FEEDNAME        = "Doxygen generated docs"
+DOCSET_FEEDURL         =
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
-# should uniquely identify the documentation set bundle. This should be a
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
-# will append .docset to the name.
 DOCSET_BUNDLE_ID       = org.doxygen.Project
-# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
-# the documentation publisher. This should be a reverse domain-name style
-# string, e.g. com.mycompany.MyDocSet.documentation.
 DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
 DOCSET_PUBLISHER_NAME  = Publisher
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
-# of the generated HTML documentation.
 GENERATE_HTMLHELP      = NO
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
-# written to the html output directory.
 CHM_FILE               =
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
 HHC_LOCATION           =
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
 GENERATE_CHI           = NO
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file
-# content.
 CHM_INDEX_ENCODING     =
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
 BINARY_TOC             = NO
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
 TOC_EXPAND             = NO
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
-# that can be used as input for Qt's qhelpgenerator to generate a
-# Qt Compressed Help (.qch) of the generated HTML documentation.
 GENERATE_QHP           = NO
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
-# be used to specify the file name of the resulting .qch file.
-# The path specified is relative to the HTML output folder.
 QCH_FILE               =
-# The QHP_NAMESPACE tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#namespace
 QHP_NAMESPACE          =
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
 QHP_VIRTUAL_FOLDER     = doc
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
-# add. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
 QHP_CUST_FILTER_NAME   =
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
-# Qt Help Project / Custom Filters</a>.
 QHP_CUST_FILTER_ATTRS  =
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's
-# filter section matches.
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
-# Qt Help Project / Filter Attributes</a>.
 QHP_SECT_FILTER_ATTRS  =
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
-# be used to specify the location of Qt's qhelpgenerator.
-# If non-empty doxygen will try to run qhelpgenerator on the generated
-# .qhp file.
 QHG_LOCATION           =
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
-#  will be generated, which together with the HTML files, form an Eclipse help
-# plugin. To install this plugin and make it available under the help contents
-# menu in Eclipse, the contents of the directory containing the HTML and XML
-# files needs to be copied into the plugins directory of eclipse. The name of
-# the directory within the plugins directory should be the same as
-# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
-# the help appears.
 GENERATE_ECLIPSEHELP   = NO
-# A unique identifier for the eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have
-# this name.
 ECLIPSE_DOC_ID         = org.doxygen.Project
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
-# at top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it. Since the tabs have the same information as the
-# navigation tree you can set this option to NO if you already set
-# GENERATE_TREEVIEW to YES.
 DISABLE_INDEX          = NO
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information.
-# If the tag value is set to YES, a side panel will be generated
-# containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
-# Windows users are probably better off using the HTML help feature.
-# Since the tree basically has the same information as the tab index you
-# could consider to set DISABLE_INDEX to NO when enabling this option.
 GENERATE_TREEVIEW      = NO
+FULL_SIDEBAR           = NO
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
-# (range [0,1..20]) that doxygen will group on one line in the generated HTML
-# documentation. Note that a value of 0 will completely suppress the enum
-# values from appearing in the overview section.
 ENUM_VALUES_PER_LINE   = 4
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
 TREEVIEW_WIDTH         = 250
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
-# links to external symbols imported via tag files in a separate window.
 EXT_LINKS_IN_WINDOW    = NO
+OBFUSCATE_EMAILS       = YES
-# Use this tag to change the font size of Latex formulas included
+HTML_FORMULA_FORMAT    = png
-# as images in the HTML documentation. The default is 10. Note that
-# when you change the font size after a successful doxygen run you need
-# to manually remove any form_*.png images from the HTML output directory
-# to force them to be regenerated.
 FORMULA_FONTSIZE       = 10
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are
-# not supported properly for IE 6.0, but are supported on all modern browsers.
-# Note that when changing this option you need to delete any form_*.png files
-# in the HTML output before the changes have effect.
 FORMULA_TRANSPARENT    = YES
+FORMULA_MACROFILE      =
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
-# (see http://www.mathjax.org) which uses client side Javascript for the
-# rendering instead of using prerendered bitmaps. Use this if you do not
-# have LaTeX installed or if you want to formulas look prettier in the HTML
-# output. When enabled you may also need to install MathJax separately and
-# configure the path to it using the MATHJAX_RELPATH option.
 USE_MATHJAX            = NO
+MATHJAX_VERSION        = MathJax_2
-# When MathJax is enabled you need to specify the location relative to the
+MATHJAX_FORMAT         = HTML-CSS
-# HTML output directory using the MATHJAX_RELPATH option. The destination
-# directory should contain the MathJax.js script. For instance, if the mathjax
-# directory is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to
-# the MathJax Content Delivery Network so you can quickly see the result without
-# installing MathJax.
-# However, it is strongly recommended to install a local
-# copy of MathJax from http://www.mathjax.org before deployment.
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
-# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
-# names that should be enabled during MathJax rendering.
 MATHJAX_EXTENSIONS     =
+MATHJAX_CODEFILE       =
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box
-# for the HTML output. The underlying search engine uses javascript
-# and DHTML and should work on any modern browser. Note that when using
-# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
-# (GENERATE_DOCSET) there is already a search function so this one should
-# typically be disabled. For large projects the javascript based search engine
-# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
 SEARCHENGINE           = NO
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a PHP enabled web server instead of at the web client
-# using Javascript. Doxygen will generate the search PHP script and index
-# file to put on the web server. The advantage of the server
-# based approach is that it scales better to large projects and allows
-# full text search. The disadvantages are that it is more difficult to setup
-# and does not have live searching capabilities.
 SERVER_BASED_SEARCH    = NO
+EXTERNAL_SEARCH        = NO
+SEARCHENGINE_URL       =
+SEARCHDATA_FILE        = searchdata.xml
+EXTERNAL_SEARCH_ID     =
+EXTRA_SEARCH_MAPPINGS  =
 #---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
+# Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
 GENERATE_LATEX         = yes
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
 LATEX_OUTPUT           = latex
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-# Note that when enabling USE_PDFLATEX this option is only used for
-# generating bitmaps for formulas in the HTML output, but not in the
-# Makefile that is written to the output directory.
 LATEX_CMD_NAME         = latex
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
 MAKEINDEX_CMD_NAME     = makeindex
+LATEX_MAKEINDEX_CMD    = makeindex
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
 COMPACT_LATEX          = NO
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, letter, legal and
-# executive. If left blank a4wide will be used.
 PAPER_TYPE             = letter
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
 EXTRA_PACKAGES         =
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
 LATEX_HEADER           =
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
-# the generated latex document. The footer should contain everything after
-# the last chapter. If it is left blank doxygen will generate a
-# standard footer. Notice: only use this tag if you know what you are doing!
 LATEX_FOOTER           =
+LATEX_EXTRA_STYLESHEET =
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+LATEX_EXTRA_FILES      =
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
 PDF_HYPERLINKS         = YES
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
-# higher quality PDF documentation.
 USE_PDFLATEX           = YES
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
 LATEX_BATCHMODE        = YES
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
 LATEX_HIDE_INDICES     = NO
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include
-# source code with syntax highlighting in the LaTeX output.
-# Note that which sources are shown also depends on other settings
-# such as SOURCE_BROWSER.
-LATEX_SOURCE_CODE      = NO
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
-# http://en.wikipedia.org/wiki/BibTeX for more info.
 LATEX_BIB_STYLE        = plain
+LATEX_TIMESTAMP        = NO
+LATEX_EMOJI_DIRECTORY  =
 #---------------------------------------------------------------------------
-# configuration options related to the RTF output
+# Configuration options related to the RTF output
 #---------------------------------------------------------------------------
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
 GENERATE_RTF           = NO
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
 RTF_OUTPUT             = rtf
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
 COMPACT_RTF            = NO
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
 RTF_HYPERLINKS         = YES
-# Load style sheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
 RTF_STYLESHEET_FILE    =
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
 RTF_EXTENSIONS_FILE    =
 #---------------------------------------------------------------------------
-# configuration options related to the man page output
+# Configuration options related to the man page output
 #---------------------------------------------------------------------------
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
 GENERATE_MAN           = NO
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
 MAN_OUTPUT             = man
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
 MAN_EXTENSION          = .3
+MAN_SUBDIR             =
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
 MAN_LINKS              = NO
 #---------------------------------------------------------------------------
-# configuration options related to the XML output
+# Configuration options related to the XML output
 #---------------------------------------------------------------------------
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation.
 GENERATE_XML           = NO
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
 XML_OUTPUT             = xml
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-XML_SCHEMA             =
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-XML_DTD                =
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
-# enabling this will significantly increase the size of the XML output.
 XML_PROGRAMLISTING     = YES
+XML_NS_MEMB_FILE_SCOPE = NO
 #---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+GENERATE_DOCBOOK       = NO
+DOCBOOK_OUTPUT         = docbook
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
 GENERATE_AUTOGEN_DEF   = NO
 #---------------------------------------------------------------------------
-# configuration options related to the Perl module output
+# Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
 GENERATE_PERLMOD       = NO
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
 PERLMOD_LATEX          = YES
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.
-# This is useful
-# if you want to understand what is going on.
-# On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
 PERLMOD_PRETTY         = YES
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
 PERLMOD_MAKEVAR_PREFIX =
 #---------------------------------------------------------------------------
 # Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
 ENABLE_PREPROCESSING   = YES
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
 MACRO_EXPANSION        = YES
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_DEFINED tags.
 EXPAND_ONLY_PREDEF     = NO
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# pointed to by INCLUDE_PATH will be searched when a #include is found.
 SEARCH_INCLUDES        = YES
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
 INCLUDE_PATH           =
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
 INCLUDE_FILE_PATTERNS  =
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed. To prevent a macro definition from being
-# undefined via #undef or recursively expanded use the := operator
-# instead of the = operator.
 PREDEFINED             =
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition that
-# overrules the definition found in the source code.
 EXPAND_AS_DEFINED      =
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all references to function-like macros
-# that are alone on a line, have an all uppercase name, and do not end with a
-# semicolon, because these will confuse the parser if not removed.
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references
+# Configuration options related to external references
 #---------------------------------------------------------------------------
-# The TAGFILES option can be used to specify one or more tagfiles. For each
-# tag file the location of the external documentation should be added. The
-# format of a tag file without this location is as follows:
-#
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-#
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths
-# or URLs. Note that each tag file must have a unique name (where the name does
-# NOT include the path). If a tag file is not located in the directory in which
-# doxygen is run, you must also specify the path to the tagfile here.
 TAGFILES               =
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
 GENERATE_TAGFILE       =
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
 ALLEXTERNALS           = NO
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
 EXTERNAL_GROUPS        = YES
+EXTERNAL_PAGES         = YES
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
-PERL_PATH              = /usr/bin/perl
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
+DIA_PATH               =
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option also works with HAVE_DOT disabled, but it is recommended to
-# install and use dot, since it yields more powerful graphs.
-CLASS_DIAGRAMS         = YES
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-MSCGEN_PATH            =
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
 HIDE_UNDOC_RELATIONS   = YES
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
 HAVE_DOT               = YES
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
-# allowed to run in parallel. When set to 0 (the default) doxygen will
-# base this on the number of processors available in the system. You can set it
-# explicitly to a value larger than 0 to get control over the balance
-# between CPU load and processing speed.
 DOT_NUM_THREADS        = 0
-# By default doxygen will use the Helvetica font for all dot files that
-# doxygen generates. When you want a differently looking font you can specify
-# the font name using DOT_FONTNAME. You need to make sure dot is able to find
-# the font, which can be done by putting it in a standard location or by setting
-# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
-# directory containing the font.
 DOT_FONTNAME           = FreeSans
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
-# The default size is 10pt.
 DOT_FONTSIZE           = 10
-# By default doxygen will tell dot to use the Helvetica font.
-# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
-# set the path where dot can find it.
 DOT_FONTPATH           =
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# CLASS_DIAGRAMS tag to NO.
 CLASS_GRAPH            = YES
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
 COLLABORATION_GRAPH    = YES
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for groups, showing the direct groups dependencies
 GROUP_GRAPHS           = YES
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
 UML_LOOK               = NO
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside
-# the class node. If there are many fields or methods and many nodes the
-# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
-# threshold limits the number of items for each type to make the size more
-# managable. Set this to 0 for no limit. Note that the threshold may be
-# exceeded by 50% before the limit is enforced.
 UML_LIMIT_NUM_FIELDS   = 10
+DOT_UML_DETAILS        = NO
-# If set to YES, the inheritance and collaboration graphs will show the
+DOT_WRAP_THRESHOLD     = 17
-# relations between templates and their instances.
 TEMPLATE_RELATIONS     = NO
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
 INCLUDE_GRAPH          = YES
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
 INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = YES
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then
+CALLER_GRAPH           = YES
-# doxygen will generate a call dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable call graphs
-# for selected functions only using the \callgraph command.
-CALL_GRAPH             = NO
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
-# doxygen will generate a caller dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable caller
-# graphs for selected functions only using the \callergraph command.
-CALLER_GRAPH           = NO
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will generate a graphical hierarchy of all classes instead of a textual one.
 GRAPHICAL_HIERARCHY    = YES
-# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
-# then doxygen will show the dependencies a directory has on other directories
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
 DIRECTORY_GRAPH        = NO
+DIR_GRAPH_MAX_DEPTH    = 1
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are svg, png, jpg, or gif.
-# If left blank png will be used. If you choose svg you need to set
-# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-# visible in IE 9+ (other browsers do not have this requirement).
 DOT_IMAGE_FORMAT       = png
+INTERACTIVE_SVG        = YES
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-# Note that this requires a modern browser other than Internet Explorer.
-# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
-# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-# visible. Older versions of IE do not have SVG support.
-INTERACTIVE_SVG        = NO
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
 DOT_PATH               =
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
 DOTFILE_DIRS           =
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the
-# \mscfile command).
 MSCFILE_DIRS           =
+DIAFILE_DIRS           =
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+PLANTUML_JAR_PATH      =
-# nodes that will be shown in the graph. If the number of nodes in a graph
+PLANTUML_CFG_FILE      =
-# becomes larger than this value, doxygen will truncate the graph, which is
+PLANTUML_INCLUDE_PATH  =
-# visualized by representing a node as a red box. Note that doxygen if the
-# number of direct children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
 DOT_GRAPH_MAX_NODES    = 50
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
 MAX_DOT_GRAPH_DEPTH    = 1000
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not
-# seem to support this out of the box. Warning: Depending on the platform used,
-# enabling this option may lead to badly anti-aliased labels on the edges of
-# a graph (i.e. they become hard to read).
 DOT_TRANSPARENT        = NO
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
-# support this, this feature is disabled by default.
 DOT_MULTI_TARGETS      = NO
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
 GENERATE_LEGEND        = YES
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
 DOT_CLEANUP            = YES
diff --git a/src/experimental/debugmutex.cpp b/src/experimental/debugmutex.cpp
new file mode 100644
index 0000000..2b61ae2
--- /dev/null
+++ b/src/experimental/debugmutex.cpp
@@ -0,0 +1,78 @@
+#include "bu/debugmutex.h"
+#include "bu/exceptionbase.h"
+Bu::DebugMutex::DebugMutex()
+{
+}
+Bu::DebugMutex::~DebugMutex()
+{
+}
+int Bu::DebugMutex::lock()
+{
+    pthread_t self = pthread_self();
+    mState.lock();
+    bool bFound = false;
+    for( ThreadList::iterator i = lThreads.begin(); i; i++ )
+    {
+        if( (*i) == self )
+        {
+            bFound = true;
+            if( (*i).bLocked == true )
+            {
+                throw Bu::ExceptionBase( Bu::String("Double lock in thread: %1").arg( (*i).sName ).end().getStr() );
+            }
+            else
+            {
+                (*i).bLocked = true;
+            }
+            break;
+        }
+    }
+    if( bFound == false )
+    {
+        lThreads.append( ThreadInfo( true ) );
+    }
+    mState.unlock();
+    return Bu::Mutex::lock();
+}
+int Bu::DebugMutex::unlock()
+{
+    pthread_t self = pthread_self();
+    mState.lock();
+    bool bFound = false;
+    for( ThreadList::iterator i = lThreads.begin(); i; i++ )
+    {
+        if( (*i) == self )
+        {
+            bFound = true;
+            if( (*i).bLocked == false )
+            {
+                throw Bu::ExceptionBase( Bu::String("Unlock in thread that did not lock: %1").arg( (*i).sName ).end().getStr() );
+            }
+            else
+            {
+                (*i).bLocked = false;
+            }
+            break;
+        }
+    }
+    if( bFound == false )
+    {
+        ThreadInfo info( false );
+        throw Bu::ExceptionBase( Bu::String("Unlock in thread that never locked mutex: %1").arg( info.sName ).end().getStr() );
+    }
+    mState.unlock();
+    return Bu::Mutex::unlock();
+}
+int Bu::DebugMutex::trylock()
+{
+    return Bu::Mutex::trylock();
+}
diff --git a/src/experimental/debugmutex.h b/src/experimental/debugmutex.h
new file mode 100644
index 0000000..ca8ef9f
--- /dev/null
+++ b/src/experimental/debugmutex.h
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2007-2023 Xagasoft, All rights reserved.
+ *
+ * This file is part of the libbu++ library and is released under the
+ * terms of the license contained in the file LICENSE.
+ */
+#ifndef BU_DEBUG_MUTEX_H
+#define BU_DEBUG_MUTEX_H
+#include "bu/mutex.h"
+#include "bu/list.h"
+#include "bu/string.h"
+namespace Bu
+{
+    /**
+     * Simple mutex wrapper.  Currently this doesn't do anything extra for you
+     * except keep all of the functionality together in an OO sorta' way and
+     * keep you from having to worry about cleaning up your mutexes properly,
+     * or initing them.
+     *@ingroup Threading
+     */
+    class DebugMutex : public Mutex
+    {
+    public:
+        /**
+         * Create an unlocked mutex.
+         */
+        DebugMutex();
+        
+        /**
+         * Destroy a mutex.  This can only be done when a mutex is unlocked.
+         * Failure to unlock before destroying a mutex object could cause it to
+         * wait for the mutex to unlock, the odds of which are usually farily
+         * low at deconstruction time.
+         */
+        virtual ~DebugMutex();
+        /**
+         * Lock the mutex.  This causes all future calls to lock on this
+         * instance of mutex to block until the first thread that called mutex
+         * unlocks it.  At that point the next thread that called lock will get
+         * a chance to go to work.  Because of the nature of a mutex lock it is
+         * a very bad idea to do any kind of serious or rather time consuming
+         * computation within a locked section.  This can cause thread-deadlock
+         * and your program may hang.
+         */
+        virtual int lock();
+        /**
+         * Unlock the mutex.  This allows the next thread that asked for a lock
+         * to lock the mutex and continue with execution.
+         */
+        virtual int unlock();
+        /**
+         * Try to lock the mutex.  This is the option to go with if you cannot
+         * avoid putting lengthy operations within a locked section.  trylock
+         * will attempt to lock the mutex, if the mutex is already locked this
+         * function returns immediately with an error code.
+         */
+        virtual int trylock();
+    private:
+        Bu::Mutex mState;
+        class ThreadInfo
+        {
+        public:
+            ThreadInfo( bool bLocked=false ) :
+                idThread( pthread_self() ),
+                bLocked( bLocked )
+            {
+                char buf[64];
+                if( pthread_getname_np( idThread, buf, 64 ) == 0 )
+                    sName = buf;
+            }
+            ~ThreadInfo() {}
+            bool operator==( const ThreadInfo &rhs )
+            {
+                return pthread_equal( idThread, rhs.idThread );
+            }
+            bool operator==( const pthread_t &rhs )
+            {
+                return pthread_equal( idThread, rhs );
+            }
+            pthread_t idThread;
+            Bu::String sName;
+            bool bLocked;
+        };
+        typedef Bu::List<ThreadInfo> ThreadList;
+        ThreadList lThreads;
+    };
+}
+#endif
diff --git a/src/stable/file.cpp b/src/stable/file.cpp
index 05e4af1..55766ea 100644
--- a/src/stable/file.cpp
+++ b/src/stable/file.cpp
@@ -142,6 +142,16 @@ bool Bu::File::isEos()
 bool Bu::File::canRead()
 {
+    return isReadable();
+}
+bool Bu::File::canWrite()
+{
+    return isWritable();
+}
+bool Bu::File::isReadable()
+{
 #ifdef WIN32
    return true;
 #else
@@ -152,7 +162,7 @@ bool Bu::File::canRead()
 #endif
 }
-bool Bu::File::canWrite()
+bool Bu::File::isWritable()
 {
 #ifdef WIN32
    return true;
@@ -164,16 +174,6 @@ bool Bu::File::canWrite()
 #endif
 }
-bool Bu::File::isReadable()
-{
-    return true;
-}
-bool Bu::File::isWritable()
-{
-    return true;
-}
 bool Bu::File::isSeekable()
 {
    return true;
diff --git a/src/stable/mutex.h b/src/stable/mutex.h
index d9e8910..8034974 100644
--- a/src/stable/mutex.h
+++ b/src/stable/mutex.h
@@ -33,7 +33,7 @@ namespace Bu
         * wait for the mutex to unlock, the odds of which are usually farily
         * low at deconstruction time.
         */
-        ~Mutex();
+        virtual ~Mutex();
        /**
         * Lock the mutex.  This causes all future calls to lock on this
@@ -44,13 +44,13 @@ namespace Bu
         * computation within a locked section.  This can cause thread-deadlock
         * and your program may hang.
         */
-        int lock();
+        virtual int lock();
        /**
         * Unlock the mutex.  This allows the next thread that asked for a lock
         * to lock the mutex and continue with execution.
         */
-        int unlock();
+        virtual int unlock();
        /**
         * Try to lock the mutex.  This is the option to go with if you cannot
@@ -58,7 +58,7 @@ namespace Bu
         * will attempt to lock the mutex, if the mutex is already locked this
         * function returns immediately with an error code.
         */
-        int trylock();
+        virtual int trylock();
    protected:
        pthread_mutex_t mutex;  /**< The internal mutex reference. */
diff --git a/src/stable/myriad.cpp b/src/stable/myriad.cpp
index 86f651e..53250c2 100644
--- a/src/stable/myriad.cpp
+++ b/src/stable/myriad.cpp
@@ -1,24 +1,25 @@
-/*
- * Copyright (C) 2007-2023 Xagasoft, All rights reserved.
- *
- * This file is part of the libbu++ library and is released under the
- * terms of the license contained in the file LICENSE.
- */
-#include "bu/config.h"
 #include "bu/myriad.h"
-#include "bu/stream.h"
 #include "bu/myriadstream.h"
+#include "bu/membuf.h"
 #include "bu/mutexlocker.h"
-#include <stdio.h>
+#include "bu/util.h"
 #include "bu/sio.h"
-using Bu::sio;
-using Bu::Fmt;
 #define Myriad_MAGIC_CODE       ((unsigned char *)"\x0a\xd3\xfa\x84")
-#define TRACE( x ) Bu::println("%1:%2: %3: %4 - %5").arg(__FILE__).arg( __LINE__ ).arg(__PRETTY_FUNCTION__).arg(sStore.getLocation()).arg(x)
+#define MyriadRead( target, size ) if( rBacking.read( target, size ) < size ) \
+{ \
+    throw Bu::MyriadException( Bu::MyriadException::invalidFormat, \
+        "Insufficient data reading myriad data from backing stream."); \
+} (void)0
+#define ReqRead( stream, target, size ) if( stream.read( target, size ) < size ) \
+{ \
+    throw Bu::MyriadException( Bu::MyriadException::invalidFormat, \
+        "Insufficient data reading from myriad stream."); \
+} (void)0
 namespace Bu
 {
@@ -28,779 +29,844 @@ namespace Bu
    }
 }
-Bu::Myriad::Myriad( Bu::Stream &sStore, int iBlockSize, int iPreallocate ) :
+Bu::Myriad::Myriad( Bu::Stream &rBacking, int iBlockSize,
-    sStore( sStore ),
+        int iPreallocateBlocks ) :
+    rBacking( rBacking ),
    iBlockSize( iBlockSize ),
-    iBlocks( 0 ),
+    iBlockCount( 0 ),
-    iUsed( 0 ),
+    bIsNewStream( true ),
-    bHeaderChanged( false )
+    bStructureChanged( false ),
+    iLastUsedIndex( -1 )
 {
-    try
+    if( !rBacking.isSeekable() )
    {
-        initialize();
+        throw Bu::MyriadException( Bu::MyriadException::invalidBackingStream,
+                "Myriad backing stream must be random access (seekable).");
    }
-    catch( Bu::MyriadException &e )
+    if( rBacking.getSize() == 0 )
    {
-        if( e.getErrorCode() == MyriadException::emptyStream )
+        createMyriad( iBlockSize, iPreallocateBlocks );
-        {
+    }
-            initialize( iBlockSize, iPreallocate );
+    else
-        }
+    {
-        else
+        loadMyriad();
-        {
-            throw;
-        }
    }
 }
 Bu::Myriad::~Myriad()
 {
-    mActiveBlocks.lock();
+    writeHeader();
-    TRACE("mActiveBlocks locked.");
+}
-    if( !hActiveBlocks.isEmpty() )
-    {
+Bu::MyriadStream Bu::Myriad::create( Bu::Myriad::Mode eMode,
-        sio << "Bu::Myriad::~Myriad(): Error: There are "
+        int32_t iPreallocateBytes )
-            << hActiveBlocks.getSize() << " unsynced blocks!" << sio.nl;
+{
-    }
+    Bu::MutexLocker l( mAccess );
-    TRACE("mActiveBlocks unlocking...");
-    mActiveBlocks.unlock();
-    sync();
-    for( StreamArray::iterator i = aStreams.begin(); i; i++ )
+    Stream *pStream = new Stream( *this, ++iLastUsedIndex, 0 );
+    int iBlocks = std::max(1, blkDiv( iPreallocateBytes, iBlockSize ));
+    for( int j = 0; j < iBlocks; j++ )
    {
-        delete *i;
+        pStream->aBlocks.append( __allocateBlock() );
    }
+    mhStream.lock();
+    hStream.insert( pStream->iStream, pStream );
+    mhStream.unlock();
+    bStructureChanged = true;
+    return Bu::MyriadStream( *this, pStream, eMode&ReadWrite );
 }
-void Bu::Myriad::sync()
+Bu::MyriadStream Bu::Myriad::open( Bu::Myriad::StreamId iStream,
+        Bu::Myriad::Mode eMode )
 {
-    updateHeader();
+    Stream *pStream = NULL;
+    Bu::MutexLocker l( mhStream );
-    mActiveBlocks.lock();
+    if( (eMode&Create) )
-    TRACE("mActiveBlocks locked.");
-    for( BlockHash::iterator i = hActiveBlocks.begin(); i; i++ )
    {
-        if( (*i)->bChanged )
+        if( hStream.has( iStream ) )
+        {
+            if( (eMode&Exclusive) )
+            {
+                throw Bu::MyriadException( MyriadException::noSuchStream,
+                    "Stream exists.");
+            }
+        }
+        else
        {
-            syncBlock( *i );
+            Bu::MutexLocker l( mAccess );
+            if( iStream >= iLastUsedIndex )
+            {
+                iLastUsedIndex = iStream;
+            }
+            pStream = new Stream( *this, iStream, 0 );
+            pStream->aBlocks.append( __allocateBlock() );
+            hStream.insert( pStream->iStream, pStream );
+            bStructureChanged = true;
        }
    }
-    TRACE("mActiveBlocks unlocked...");
+    if( !hStream.has( iStream ) )
-    mActiveBlocks.unlock();
-}
-void Bu::Myriad::initialize()
-{
-    MutexLocker mLock( mHeader );
-    TRACE("mHeader locked.");
-    lFreeBlocks.clear();
-    sStore.setPosEnd( 0 );
-    Bu::size iSize = sStore.tell();
-    sStore.setPos( 0 );
-    unsigned char buf[4];
-    if( sStore.read( buf, 4 ) < 4 )
    {
-        TRACE("mHeader unlocked...");
+        throw Bu::MyriadException( MyriadException::noSuchStream,
-        throw MyriadException( MyriadException::emptyStream,
+            "No such stream.");
-                "Input stream appears to be empty.");
    }
-    if( memcmp( buf, Myriad_MAGIC_CODE, 4 ) )
    {
-        TRACE("mHeader unlocked...");
+        Bu::MutexLocker l2( mBacking );
-        throw MyriadException( MyriadException::invalidFormat,
+        if( (eMode&Write) && !rBacking.isWritable() )
-            "Stream does not appear to be a valid Myriad format.");
+        {
+            throw Bu::MyriadException( MyriadException::badMode,
+                "Backing stream does not support writing.");
+        }
    }
-    sStore.read( buf, 2 );
+    if( pStream == NULL )
-    if( buf[0] != 1 )
    {
-        TRACE("mHeader unlocked...");
+        pStream = hStream.get( iStream );
-        throw MyriadException( MyriadException::badVersion,
-            "We can only handle version 1 for now.");
    }
-    if( buf[1] != 32 )
+    if( (eMode&Truncate) )
    {
-        TRACE("mHeader unlocked...");
+        pStream->setSize( 0 );
-        throw MyriadException( MyriadException::invalidWordSize,
-            "We can only handle 32-bit words at the moment.");
    }
-    sStore.read( &iBlockSize, 4 );
+    return Bu::MyriadStream( *this, pStream, eMode );
-    int iStreams;
+}
-    sStore.read( &iStreams, 4 );
-    iBlocks = iSize/iBlockSize;
-    //sio << "Myriad: iSize=" << iSize << ", iBlockSize=" << iBlockSize
-    //  << ", iBlocks=" << iBlocks << ", iStreams=" << iStreams << sio.nl;
-    int iHeaderSize = 14 + 8 + 4;
+Bu::Myriad::StreamId Bu::Myriad::allocate()
-    int iHeaderBlocks = 0; //blkDiv( iHeaderSize+4, iBlockSize );
+{
+    Bu::MutexLocker l( mAccess );
-    while( iHeaderSize > iHeaderBlocks*iBlockSize )
+    Stream *pStream = new Stream( *this, ++iLastUsedIndex, 0 );
-    {
+    mhStream.lock();
-        iHeaderBlocks = blkDiv( iHeaderSize+4, iBlockSize );
+    hStream.insert( pStream->iStream, pStream );
-        iHeaderSize = 14 + 8 + 4*iHeaderBlocks;
+    mhStream.unlock();
-    }
+    bStructureChanged = true;
-    //sio << "Myriad: iHeaderSize=" << iHeaderSize
+    return pStream->iStream;
-    //  << ", iHeaderBlocks=" << iHeaderBlocks << sio.nl;
+}
-    Stream *pFakeHdr = new Stream;
+void Bu::Myriad::erase( Bu::Myriad::StreamId iStream )
-    pFakeHdr->iId = 0;
+{
-    pFakeHdr->iSize = iHeaderSize;
+    // For now, let's prevent you from erasing a stream if it's open.
-    for( int j = 0; j < iHeaderBlocks; j++ )
+    Bu::MutexLocker l( mhStream );
+    if( !hStream.has( iStream ) )
    {
-        pFakeHdr->aBlocks.append( j );
+        throw Bu::MyriadException( Bu::MyriadException::noSuchStream,
+                "No such stream exists.");
    }
+    Stream *pStream = hStream.get( iStream );
-//  sio << "Blocks: " << iBlocks << " (size = " << iSize << "/" << iBlockSize
-//      << ")" << sio.nl;
-    Bu::BitString bsBlockUsed( iBlocks, false );
-    bsBlockUsed.clear();
-//  bool bCanSkip = false; // Can skip around, post initial header stream i/o
-    MyriadStream *pIn = new MyriadStream( *this, pFakeHdr );
-    pIn->setPos( sStore.tell() );
-    for( int j = 0; j < iStreams; j++ )
    {
-        aStreams.append( new Stream() );
+        Bu::MutexLocker sl( pStream->mAccess );
-        Stream &s = *aStreams[j];
+        if( pStream->iOpenCount > 0 )
-        pIn->read( &s.iId, 4 );
-        pIn->read( &s.iSize, 4 );
-        int iSBlocks = blkDiv(s.iSize, iBlockSize);
-    //  sio << "Myriad: - Stream::iId=" << s.iId
-    //      << ", Stream::iSize=" << s.iSize
-    //      << ", Stream::aBlocks=" << iSBlocks
-    //      << ", pIn->tell()=" << pIn->tell() << sio.nl;
-        for( int k = 0; k < iSBlocks; k++ )
        {
-            int iBId;
+            throw Bu::MyriadException( Bu::MyriadException::streamOpen,
-            pIn->read( &iBId, 4 );
+                    "Cannot currently erase a stream while it is open.");
-    //      sio << "Myriad:   - iBId=" << iBId
-    //          << ", iStartPos=" << iBId*iBlockSize
-    //          << ", pIn->tell()=" << pIn->tell() << sio.nl;
-            s.aBlocks.append( iBId );
-            bsBlockUsed.setBit( iBId );
-            iUsed++;
-            if( (j == 0 && k == iHeaderBlocks-1) )
-            {
-    //          sio << "Myriad:   - End of prepartition, unlocking skipping."
-    //              << sio.nl;
-//              bCanSkip = true;
-                MyriadStream *pTmp = new MyriadStream( *this, aStreams[0] );
-    //          sio << "Myriad    - Position = " << pIn->tell() << sio.nl;
-                pTmp->setPos( pIn->tell() );
-                delete pIn;
-                delete pFakeHdr;
-                pIn = pTmp;
-            }
        }
-    }
-    delete pIn;
-    for( int j = 0; j < iBlocks; j++ )
+        for( Bu::Array<int32_t>::iterator i = pStream->aBlocks.begin(); i; i++ )
-    {
-        if( bsBlockUsed.getBit( j ) == false )
        {
-//          sio << "Preinitialized block " << j << " is free." << sio.nl;
+            releaseBlock( *i, false );
-            lFreeBlocks.append( j );
        }
+        pStream->aBlocks.clear();
+        hStream.erase( iStream );
    }
-//  sio << "Myriad: Blocks used: " << bsBlockUsed.toString() << sio.nl;
+    delete pStream;
-    TRACE("mHeader unlocked...");
 }
-void Bu::Myriad::initialize( int iBlockSize, int iPreAllocate )
+void Bu::Myriad::setSize( Bu::Myriad::StreamId iStream,
+        int32_t iNewSize )
 {
-    MutexLocker mLock( mHeader );
+    Stream *pStream;
-    TRACE("mHeader locked.");
-    lFreeBlocks.clear();
-    for( StreamArray::iterator i = aStreams.begin(); i; i++ )
    {
-        delete *i;
+        Bu::MutexLocker l( mhStream );
-    }
+        pStream = hStream.get( iStream );
-    aStreams.clear();
-    iUsed = 0;
-    int iHeaderSize = 14 + 8 + 4;
-    int iHeaderBlocks = 0; //blkDiv( iHeaderSize+4, iBlockSize );
-    char cBuf = 1;
-    int iBuf = 0;
-    
-    Stream *pStr = new Stream;
-    pStr->iId = 0;
-    while( iHeaderSize > iHeaderBlocks*iBlockSize )
-    {
-        iHeaderBlocks = blkDiv( iHeaderSize+4, iBlockSize );
-        iHeaderSize = 14 + 8 + 4*iHeaderBlocks;
    }
+    pStream->setSize( iNewSize );
+}
-    iPreAllocate += iHeaderBlocks;
+int32_t Bu::Myriad::getSize( StreamId iStream ) const
+{
+    Bu::MutexLocker l( mhStream );
+    return hStream.get( iStream )->getSize();
+}
-    //sio << "Myriad: iHeaderSize=" << iHeaderSize << ", iBlockSize="
+bool Bu::Myriad::exists( StreamId iStream ) const
-    //  << iBlockSize << ", iHeaderBlocks=" << iHeaderBlocks << sio.nl;
+{
-    
+    Bu::MutexLocker l( mhStream );
-//  bsBlockUsed.setSize( iPreAllocate, true );
+    return hStream.has( iStream );
-    iUsed++;
+}
-    char *pBlock = new char[iBlockSize];
+Bu::String Bu::Myriad::getLocation() const
-    memset( pBlock, 0, iBlockSize );
+{
-    for( int j = 0; j < iPreAllocate; j++ )
+    Bu::MutexLocker l( mAccess );
-    {
+    Bu::MutexLocker l2( mBacking );
-        sStore.write( pBlock, iBlockSize );
+    return Bu::String("myriad(%1,%2):%3")
-    }
+        .arg( 1 ).arg( iBlockSize ).arg( rBacking.getLocation() );
-    delete[] (char *)pBlock;
+}
-    sStore.setPos( 0 );
+int32_t Bu::Myriad::getBlockSize() const
+{
+    Bu::MutexLocker l( mAccess );
+    return iBlockSize;
+}
-    // Magic number
+int32_t Bu::Myriad::getTotalBlocks() const
-    sStore.write( Myriad_MAGIC_CODE, 4 );
+{
+    Bu::MutexLocker l( mAccess );
+    return iBlockCount;
+}
-    // Version (0)
+int32_t Bu::Myriad::getUsedBlocks() const
-    sStore.write( &cBuf, 1 );
+{
+    Bu::MutexLocker l( mAccess );
+    return iBlockCount-lFreeBlocks.getSize();
+}
-    // Bits per int
+int32_t Bu::Myriad::getFreeBlocks() const
-    cBuf = 32;
+{
-    sStore.write( &cBuf, 1 );
+    Bu::MutexLocker l( mAccess );
+    return lFreeBlocks.getSize();
+}
-    // The size of each block
+int32_t Bu::Myriad::getTotalStreams() const
-    sStore.write( &iBlockSize, 4 );
+{
+    Bu::MutexLocker l( mhStream );
+    return hStream.getSize();
+}
-    iBuf = 1;
+int32_t Bu::Myriad::getTotalUsedBytes() const
-    // The number of streams
+{
-    sStore.write( &iBuf, 4 );
+    Bu::MutexLocker l( mhStream );
-    
+    int32_t iTotal = 0;
-    // Stream header
+    for( StreamHash::const_iterator i = hStream.begin(); i; i++ )
-    iBuf = 0;
-    sStore.write( &iBuf, 4 );
-    sStore.write( &iHeaderSize, 4 );
-    for( iBuf = 0; iBuf < iHeaderBlocks; iBuf++ )
    {
-        sStore.write( &iBuf, 4 );
+        iTotal += i.getValue()->getSize();
    }
-    this->iBlockSize = iBlockSize;
+    return iTotal;
-    this->iBlocks = iPreAllocate;
+}
-    
-    pStr->iSize = sStore.tell();
-//  sio << "Myriad: Actual end of header stream = " << pStr->iSize << sio.nl;
-    pStr->iSize = iHeaderSize;
+int32_t Bu::Myriad::getTotalUnusedBytes(int32_t iAssumeBlockSize ) const
-    for( int j = 0; j < iHeaderBlocks; j++ )
+{
+    if( iAssumeBlockSize < 0 )
    {
-//      sio << "Started block " << j << " is header." << sio.nl;
+        iAssumeBlockSize = getBlockSize();
-        pStr->aBlocks.append( j );
-//      bsBlockUsed.setBit( j );
-        iUsed++;
    }
-    for( int j = iHeaderBlocks; j < this->iBlocks; j++ )
+    int32_t iTotal = 0;
    {
-//      sio << "Started block " << j << " is free." << sio.nl;
+        Bu::MutexLocker l( mhStream );
-        lFreeBlocks.append( j );
+        for( StreamHash::const_iterator i = hStream.begin(); i; i++ )
+        {
+            if( (i.getValue()->getSize()%iAssumeBlockSize) > 0 )
+                iTotal += iBlockSize-(i.getValue()->getSize()%iAssumeBlockSize);
+        }
    }
-    aStreams.append( pStr );
+    {
+        Bu::MutexLocker l( mAccess );
+        iTotal += lFreeBlocks.getSize()*iBlockSize;
+    }
-    //sio << bsBlockUsed.toString() << " - " << pStr->aBlocks << sio.nl;
+    return iTotal;
+}
-    bHeaderChanged = true;
+Bu::Myriad::StreamIdList Bu::Myriad::getStreamList() const
-    //hStreams.insert( 0, BlockArray( 0 ) );
+{
-    TRACE("mHeader unlocked...");
+    mhStream.lock();
+    StreamIdList lIds = hStream.getKeys();
+    mhStream.unlock();
+    lIds.sort();
+    if( lIds.first() == 0 )
+    {
+        lIds.eraseFirst();
+    }
+    return lIds;
 }
-void Bu::Myriad::updateHeader()
+Bu::BitString Bu::Myriad::buildBlockUseMap() const
 {
-    MutexLocker mLock( mHeader );
+    Bu::MutexLocker l( mAccess );
-    TRACE("mHeader locked.");
+    Bu::BitString bsMap( iBlockCount );
+    bsMap.fill();
+    for( IndexList::const_iterator i = lFreeBlocks.begin(); i; i++ )
+    {
+        bsMap.setBit( *i, false );
+    }
+    return bsMap;
+}
-    if( bHeaderChanged == false )
+Bu::Myriad::StreamIdArray Bu::Myriad::buildBlockMap() const
+{
+    Bu::MutexLocker l( mAccess );
+    StreamIdArray bm( iBlockCount );
+    for( int j = 0; j < iBlockCount; j++ )
    {
-        TRACE("mHeader unlocked...");
+        bm.append( -1 );
-        return;
    }
-    if( !sStore.canWrite() )
+    Bu::MutexLocker l2( mhStream );
+    for( StreamHash::const_iterator iStream = hStream.begin();
+         iStream; iStream++ )
    {
-        TRACE("mHeader unlocked...");
+        int32_t iId = iStream.getKey();
-        return;
+        Stream *pStream = iStream.getValue();
+        for( Bu::Array<int32_t>::const_iterator iBlock =
+             pStream->aBlocks.begin(); iBlock; iBlock++ )
+        {
+            bm[*iBlock] = iId;
+        }
    }
+    return bm;
+}
-    char cBuf;
+void Bu::Myriad::sync()
-    int iBuf;
+{
+    writeHeader();
+}
-    //for( StreamArray::iterator i = aStreams.begin(); i; i++ )
+bool Bu::Myriad::loadMyriad()
-    //{
+{
-    //  sio << "Myriad: Stream " << Fmt(4) << (*i)->iId << ": " << (*i)->aBlocks << sio.nl;
+    //Bu::println("Load myriad!");
-    //}
+    char sMagicCode[4];
+    rBacking.setPos( 0 );
+    MyriadRead( sMagicCode, 4 );
+    if( memcmp( sMagicCode, Myriad_MAGIC_CODE, 4 ) )
+    {
+        throw Bu::MyriadException( Bu::MyriadException::invalidFormat,
+                "Backing stream does not seem to be a Myriad structure.");
+    }
+    uint8_t uVer;
+    uint8_t uBitsPerInt;
+    MyriadRead( &uVer, 1 );
+    if( uVer != 1 )
+    {
+        throw Bu::MyriadException( Bu::MyriadException::invalidFormat,
+                "Only version 1 myriad structures are supported.");
+    }
+    MyriadRead( &uBitsPerInt, 1 );
+    if( uBitsPerInt != 32 )
+    {
+        throw Bu::MyriadException( Bu::MyriadException::invalidFormat,
+                "Only 32 bits per int are supported at this time.");
+    }
+    MyriadRead( &iBlockSize, 4 );
-    // Compute the new size of the header.
+    iBlockCount = rBacking.getSize()/iBlockSize;
-    int iHeaderSize = 14 + 8*aStreams.getSize();
+    if( (rBacking.getSize()%iBlockSize) != 0 )
-//  sio << "Myriad: updateHeader: aStreams.getSize() = " << aStreams.getSize()
-//      << sio.nl;
-    for( StreamArray::iterator i = aStreams.begin(); i; i++ )
    {
-        iHeaderSize += 4*(*i)->aBlocks.getSize();
+        throw Bu::MyriadException( Bu::MyriadException::invalidFormat,
-//      sio << "Myriad: updateHeader: (*i)->aBlocks.getSize() = "
+                "Backing stream is not cleanly divisibly by the block size.");
-//          << (*i)->aBlocks.getSize() << sio.nl;
    }
-    int iNewBlocks = blkDiv( iHeaderSize, iBlockSize );
-    while( iNewBlocks > aStreams[0]->aBlocks.getSize() )
+    Bu::Hash<int32_t,bool> hUnusedBlocks;
+    for( int32_t j = 0; j < iBlockCount; j++ )
    {
-        int iBlock = findEmptyBlock();
+        hUnusedBlocks.insert( j, true );
-//      sio << "Myriad: updateHeader: Appending block " << iBlock
-//          << " to header." << sio.nl;
-        aStreams[0]->aBlocks.append( iBlock );
-//      bsBlockUsed.setBit( iBlock );
-        iUsed++;
-        iHeaderSize += 4;
-        iNewBlocks = blkDiv( iHeaderSize, iBlockSize );
    }
-    aStreams[0]->iSize = iHeaderSize;
-//  sio << "Myriad: updateHeader: iHeaderSize=" << iHeaderSize
-//      << ", iNewBlocks=" << iNewBlocks << ", curBlocks="
-//      << aStreams[0]->aBlocks.getSize() << sio.nl;
-    MyriadStream sHdr( *this, aStreams[0] );
+    int iStreamCount;
-    sHdr.write( Myriad_MAGIC_CODE, 4 );
+    MyriadRead( &iStreamCount, 4 );
+    //
+    // Read stream data -- Bootstrap the zero stream
+    //
+    StreamId iStream;
+    MyriadRead( &iStream, 4 );
+    if( iStream != 0 )
+    {
+        throw Bu::MyriadException( Bu::MyriadException::invalidFormat,
+                "The first stream defined must be the header/zero stream.");
+    }
+    iLastUsedIndex = iStream;
+    int32_t iHeaderStreamBytes;
+    MyriadRead( &iHeaderStreamBytes, 4 );
-    // Version (1)
+    Stream *pHeaderStream = new Stream( *this, iStream, iHeaderStreamBytes );
-    cBuf = 1;
+    hStream.insert( iStream, pHeaderStream );
-    sHdr.write( &cBuf, 1 );
+    int iHeaderStreamBlocks = blkDiv(iHeaderStreamBytes, iBlockSize );
+    MyriadStream sHeader( *this, pHeaderStream, Read );
-    // Bits per int
+    // We need to read enough so that we can gurantee that we're within a block
-    cBuf = 32;
+    // that we have read the index to, plus one index.
-    sHdr.write( &cBuf, 1 );
+    for( int32_t j = 0; j < iHeaderStreamBlocks; j++ )
+    {
+        int32_t iBlockIndex;
+        MyriadRead( &iBlockIndex, 4 );
+        hUnusedBlocks.erase( iBlockIndex );
+        pHeaderStream->aBlocks.append( iBlockIndex );
+        if( rBacking.tell()+4 <= (j+1)*iBlockSize )
+            break;
+    }
-    // The size of each block
+    // Bootstrap now using the header stream to read the rest of the data.
-    sHdr.write( &iBlockSize, 4 );
+    sHeader.setPos( rBacking.tell() );
+    while( pHeaderStream->aBlocks.getSize() < iHeaderStreamBlocks )
+    {
+        int32_t iBlockIndex;
+        ReqRead( sHeader, &iBlockIndex, 4 );
+        hUnusedBlocks.erase( iBlockIndex );
+        pHeaderStream->aBlocks.append( iBlockIndex );
+    }
-    iBuf = aStreams.getSize();
+    // Ok, now we can read the rest of the header in.
-    // The number of streams
+    for( int j = 1; j < iStreamCount; j++ )
-    sHdr.write( &iBuf, 4 );
-    
-    for( StreamArray::iterator i = aStreams.begin(); i; i++ )
    {
-        sHdr.write( &(*i)->iId, 4 );
+        int32_t iStreamBytes;
-        sHdr.write( &(*i)->iSize, 4 );
+        ReqRead( sHeader, &iStream, 4 );
-        int iUsedBlocks = blkDiv( (*i)->iSize, iBlockSize );
+        ReqRead( sHeader, &iStreamBytes, 4 );
-//      for( BlockArray::iterator j = (*i)->aBlocks.begin(); j; j++ )
+        Stream *pStream = new Stream( *this, iStream, iStreamBytes );
-        for( int j = 0; j < iUsedBlocks; j++ )
+        int32_t iBlocks = blkDiv(iStreamBytes, iBlockSize );
+        for( int k = 0; k < iBlocks; k++ )
        {
-            sHdr.write( &(*i)->aBlocks[j], 4 );
+            int32_t iBlockIndex;
+            ReqRead( sHeader, &iBlockIndex, 4 );
+            hUnusedBlocks.erase( iBlockIndex );
+            pStream->aBlocks.append( iBlockIndex );
        }
+        hStream.insert( iStream, pStream );
+        if( iLastUsedIndex < iStream )
+            iLastUsedIndex = iStream;
    }
+    lFreeBlocks = hUnusedBlocks.getKeys();
+    //Bu::println("Free blocks: %1").arg( lFreeBlocks.getSize() );
    
-    bHeaderChanged = false;
+    bIsNewStream = false;
-    TRACE("mHeader unlocked...");
+    return true;
 }
-int Bu::Myriad::createStream( int iPreAllocate )
+void Bu::Myriad::createMyriad( int32_t iBlockSize, int32_t iPreallocateBlocks )
 {
-    MutexLocker mLock( mHeader );
+    if( iBlockSize < 8 )
-    TRACE("mHeader locked.");
+    {
+        throw Bu::MyriadException( Bu::MyriadException::invalidParameter,
+                "iBlockSize cannot be below 8");
+    }
+    if( rBacking.getSize() )
+    {
+        throw Bu::MyriadException( Bu::MyriadException::invalidFormat,
+                "Backing stream contains data, but not a myriad structure.");
+    }
+    // Start with the bytes for the file header and initial stream header
+    int iHeaderStreamBytes
+        = 14 // Base header
+        + 8; // Stream header
+             
+    // Pick the block count that matches our current estimate for the header
+    // plus one block index.
+    int iHeaderStreamBlocks = blkDiv(iHeaderStreamBytes+4, iBlockSize );
-    Stream *pStr = new Stream();
+    //Bu::println("Initial estimate: %1 bytes / %2 cur blocks, %3 computed blocks (%4 target bytes).").arg( iHeaderStreamBytes+(iHeaderStreamBlocks*4) ).arg( iHeaderStreamBlocks ).arg( blkDiv((iHeaderStreamBytes+(iHeaderStreamBlocks*4)), iBlockSize) ).arg( iHeaderStreamBlocks*iBlockSize );
-    pStr->iId = aStreams.last()->iId+1;
+    while( iHeaderStreamBytes+(iHeaderStreamBlocks*4)
-    //sio << "Myriad: New stream id=" << pStr->iId << ", iPreAllocate="
+           > iHeaderStreamBlocks*iBlockSize )
-    //  << iPreAllocate << sio.nl;
+    {
-    pStr->iSize = 0;
+        iHeaderStreamBlocks = blkDiv((iHeaderStreamBytes+((iHeaderStreamBlocks+1)*4)), iBlockSize);
-    aStreams.append( pStr );
+        if( iHeaderStreamBlocks > 100 )
+            break;
+        //Bu::println("      Adjustment: %1 bytes / %2 cur blocks, %3 computed blocks (%4 target bytes).").arg( iHeaderStreamBytes+(iHeaderStreamBlocks*4) ).arg( iHeaderStreamBlocks ).arg( blkDiv((iHeaderStreamBytes+(iHeaderStreamBlocks*4)), iBlockSize) ).arg( iHeaderStreamBlocks*iBlockSize );
+    }
-    for( int j = 0; j < iPreAllocate; j++ )
+    if( iPreallocateBlocks < iHeaderStreamBlocks )
    {
-        int iFreeBlock = findEmptyBlock();
+        iPreallocateBlocks = iHeaderStreamBlocks;
-//      sio << "Myriad: Adding block " << iFreeBlock << sio.nl;
-        pStr->aBlocks.append( iFreeBlock );
-//      bsBlockUsed.setBit( iFreeBlock );
-        iUsed++;
    }
+    rBacking.setSize( iBlockSize*iPreallocateBlocks );
-    bHeaderChanged = true;
+    //
+    // Write Myriad header
+    //
+    uint8_t uVer = 1;
+    uint8_t uBpi = 32;
+    int32_t iStreamCount = 1;
+    rBacking.setPos( 0 );
+    rBacking.write( Myriad_MAGIC_CODE, 4 );
+    rBacking.write( &uVer, 1 );
+    rBacking.write( &uBpi, 1 );
+    rBacking.write( &iBlockSize, 4 );
+    rBacking.write( &iStreamCount, 4 );
-    TRACE("mHeader unlocked...");
+    Stream *pHeadStream = new Stream( *this, 0, Bu::Myriad::ReadWrite );
-    return pStr->iId;
+    //
-}
+    // Write stream header
+    //
+    uint32_t uStreamId = 0;
+    uint32_t uStreamSize = iHeaderStreamBytes+iHeaderStreamBlocks*4;
+    rBacking.write( &uStreamId, 4 );
+    rBacking.write( &uStreamSize, 4 );
+    for( int iBlockIndex = 0; iBlockIndex < iHeaderStreamBlocks; iBlockIndex++ )
+    {
+        rBacking.write( &iBlockIndex, 4 );
+        pHeadStream->aBlocks.append( iBlockIndex );
+    }
+    rBacking.flush();
-int Bu::Myriad::createStreamWithId( int iId, int iPreAllocate )
+    hStream.insert( pHeadStream->iStream, pHeadStream );
-{
-    MutexLocker mLock( mHeader );
-    TRACE("mHeader locked.");
-    try
+    for( int32_t j = iHeaderStreamBlocks; j < iPreallocateBlocks; j++ )
    {
-        findStream( iId );
+        lFreeBlocks.append( j );
-        TRACE("mHeader unlocked...");
-        throw MyriadException( MyriadException::streamExists,
-            "There is already a stream with the given id.");
    }
-    catch( MyriadException &e )
+    iLastUsedIndex = 0;
+    iBlockCount = iPreallocateBlocks;
+}
+void Bu::Myriad::writeHeader()
+{
+    Bu::MutexLocker l( mAccess );
+    if( !rBacking.isWritable() )
+        return;
+    //Bu::println("Writing stream breakdown:");
+    Bu::MemBuf mbHeader;
    {
-        Stream *pStr = new Stream();
+        Bu::MutexLocker l2( mhStream );
-        pStr->iId = iId;
-        //sio << "Myriad: New stream id=" << pStr->iId << ", iPreAllocate="
+        int32_t iHdrStreamSize = __calcHeaderSize();
-        //  << iPreAllocate << sio.nl;
+        // Maybe just do stream surgery here.
-        pStr->iSize = 0;
-        if( aStreams.last()->iId < iId )
-        {
-            aStreams.append( pStr );
-        }
-        else
        {
-            for( StreamArray::iterator i = aStreams.begin(); i; i++ )
+            Stream *psHeader = hStream.get( 0 );
+            Bu::MutexLocker l2( psHeader->mAccess );
+            int iNewBlocks = Bu::blkDiv( iHdrStreamSize, iBlockSize );
+            if( iHdrStreamSize < psHeader->iSize )
            {
-                if( (*i)->iId > iId )
+                while( psHeader->aBlocks.getSize() > iNewBlocks )
                {
-                    aStreams.insert( i, pStr );
+                    __releaseBlock( psHeader->aBlocks.last(), false );
-                    break;
+                    psHeader->aBlocks.eraseLast();
                }
            }
+            else if( iHdrStreamSize > psHeader->iSize )
+            {
+                while( psHeader->aBlocks.getSize() < iNewBlocks )
+                {
+                    psHeader->aBlocks.append( __allocateBlock() );
+                }
+            }
+            psHeader->iSize = iHdrStreamSize;
        }
-        for( int j = 0; j < iPreAllocate; j++ )
+        //Bu::println("Computed header size: %1 bytes. Ver=%2, Bpi=%3, BlockSize=%4").arg( iHdrStreamSize ).arg( 1 ).arg( 32 ).arg( iBlockSize );
+        
+        uint8_t uVer = 1;
+        uint8_t uBpi = 32;
+        int32_t iStreamCount = hStream.getSize();
+        mbHeader.write( Myriad_MAGIC_CODE, 4 );
+        mbHeader.write( &uVer, 1 );
+        mbHeader.write( &uBpi, 1 );
+        mbHeader.write( &iBlockSize, 4 );
+        mbHeader.write( &iStreamCount, 4 );
+        StreamHash::KeyList lStreamId = hStream.getKeys();
+        lStreamId.sort();
+        if( lStreamId.first() != 0 )
+        {
+            throw Bu::MyriadException( Bu::MyriadException::invalidFormat,
+                    "There doesn't appear to be a zero (header) stream.");
+        }
+        for( StreamHash::KeyList::iterator i = lStreamId.begin(); i; i++ )
        {
-            int iFreeBlock = findEmptyBlock();
+            uint32_t uStreamId = *i;
-    //      sio << "Myriad: Adding block " << iFreeBlock << sio.nl;
+            Stream *pStream = hStream.get( uStreamId );
-            pStr->aBlocks.append( iFreeBlock );
+            uint32_t uStreamSize = pStream->getSize();
-//          bsBlockUsed.setBit( iFreeBlock );
+            mbHeader.write( &uStreamId, 4 );
-            iUsed++;
+            mbHeader.write( &uStreamSize, 4 );
+            int32_t iBlocks = Bu::blkDiv( uStreamSize, (uint32_t)iBlockSize );
+            Bu::Array<int32_t> aBlocks = pStream->getBlockList();
+            
+            //Bu::println("  Stream %1 is %2 bytes %3 blocks (%4 blocks computed)").arg( *i ).arg( uStreamSize ).arg( aBlocks.getSize() ).arg( Bu::blkDiv( (int)uStreamSize, (int)iBlockSize ) );
+//            for( Bu::Array<int32_t>::iterator i = aBlocks.begin(); i; i++ )
+            for( int j = 0; j < iBlocks; j++ )
+            {
+                mbHeader.write( &aBlocks[j], 4 );
+            }
        }
-        bHeaderChanged = true;
-        TRACE("mHeader unlocked...");
-        return pStr->iId;
    }
-    TRACE("mHeader unlocked...");
-}
-int Bu::Myriad::findEmptyBlock()
+    Bu::MyriadStream sHeader( *this, hStream.get( 0 ), Bu::Myriad::Write );
-{
+    sHeader.write( mbHeader.getString() );
-    bHeaderChanged = true;
+    bStructureChanged = false;
-    if( lFreeBlocks.isEmpty() )
-    {
-        sStore.setSize( (iBlocks+1)*(Bu::size)iBlockSize );
-        return iBlocks++;
-    }
-    else
-    {
-        return lFreeBlocks.dequeue();
-    }
 }
-void Bu::Myriad::deleteStream( int iId )
+int32_t Bu::Myriad::__calcHeaderSize()
 {
-    MutexLocker mLock( mHeader );
+    int32_t iHdrSize = 4+1+1+4+4;
-    TRACE("mHeader locked.");
-    if( iId < 0 )
+    StreamHash::KeyList lStreamId = hStream.getKeys();
+    lStreamId.sort();
+    if( lStreamId.first() != 0 )
    {
-        TRACE("mHeader unlocked...");
+        throw Bu::MyriadException( Bu::MyriadException::invalidFormat,
-        throw MyriadException( MyriadException::invalidStreamId,
+                "There doesn't appear to be a zero (header) stream.");
-                "Invalid stream id.");
    }
-    if( iId == 0 )
+    for( StreamHash::KeyList::iterator i = lStreamId.begin(); i; i++ )
    {
-        TRACE("mHeader unlocked...");
+        iHdrSize += 4+4;
-        throw MyriadException( MyriadException::protectedStream,
+        int32_t iStreamSize = hStream.get( *i )->getSize();
-                "You cannot delete stream zero, it is protected.");
+        if( (*i) != 0 )
-    }
-    for( StreamArray::iterator i = aStreams.begin(); i; i++ )
-    {
-        if( (*i)->iId == iId )
        {
-            Stream *pStream = *i;
+            iHdrSize += Bu::blkDiv( iStreamSize, iBlockSize )*4;
-            for( BlockArray::iterator j = pStream->aBlocks.begin(); j; j++ )
-            {
-                lFreeBlocks.append( *j );
-//              bsBlockUsed.setBit( *j, false );
-                iUsed--;
-            }
-            aStreams.erase( i );
-            bHeaderChanged = true;
-            delete pStream;
-            TRACE("mHeader unlocked...");
-            return;
        }
    }
-    TRACE("mHeader unlocked...");
-}
-Bu::Array<int> Bu::Myriad::getStreamIds()
+    //Bu::println("HeaderCalc:");
-{
+    //Bu::println("  Base (no header stream): %1").arg( iHdrSize );
-    MutexLocker mLock( mHeader );
+    int32_t iNewSize = iHdrSize;
-    TRACE("mHeader locked.");
+    int32_t iOldSize;
-    Bu::Array<int> aRet( aStreams.getSize() );
+    do {
-    for( StreamArray::iterator i = aStreams.begin(); i; i++ )
+        iOldSize = iNewSize;
-    {
+        iNewSize = iHdrSize + Bu::blkDiv(iNewSize, iBlockSize)*4;
-        aRet.append( (*i)->iId );
+        //Bu::println("  Recomp: %1").arg( iNewSize );
-    }
+    } while( iOldSize != iNewSize );
-    TRACE("mHeader unlocked...");
+    return iNewSize;
-    return aRet;
 }
-int Bu::Myriad::getStreamSize( int iId )
+int32_t Bu::Myriad::allocateBlock()
 {
-    MutexLocker mLock( mHeader );
+    Bu::MutexLocker l( mAccess );
-    TRACE("mHeader locked.");
+    return __allocateBlock();
-    TRACE("mHeader unlocked...");
-    return findStream( iId )->iSize;
 }
-bool Bu::Myriad::hasStream( int iId )
+int32_t Bu::Myriad::__allocateBlock()
 {
-    MutexLocker mLock( mHeader );
+    bStructureChanged = true;
-    TRACE("mHeader locked.");
+    if( lFreeBlocks.isEmpty() )
-    try
    {
-        findStream( iId );
+        // Increase the size of the backing stream
-        TRACE("mHeader unlocked...");
+        int32_t iIndex = iBlockCount++;
-        return true;
+        rBacking.setSize( iBlockCount*iBlockSize );
-    }catch(...)
+        return iIndex;
+    }
+    else
    {
-        TRACE("mHeader unlocked...");
+        // Provide an existing free block.
-        return false;
+        return lFreeBlocks.peekPop();
    }
 }
-Bu::MyriadStream Bu::Myriad::openStream( int iId )
+void Bu::Myriad::releaseBlock( int32_t iBlockId, bool bBlank )
 {
-    MutexLocker mLock( mHeader );
+    Bu::MutexLocker l( mAccess );
-    TRACE("mHeader locked.");
+    __releaseBlock( iBlockId, bBlank );
-    TRACE("mHeader unlocked...");
-    //sio << "Myriad:  Request to open stream: " << iId << sio.nl;
-    return MyriadStream( *this, findStream( iId ) );
 }
-int Bu::Myriad::getNumStreams()
+void Bu::Myriad::__releaseBlock( int32_t iBlockId, bool bBlank )
 {
-    MutexLocker mLock( mHeader );
+    bStructureChanged = true;
-    TRACE("mHeader locked.");
+    lFreeBlocks.append( iBlockId );
+    if( bBlank )
-    TRACE("mHeader unlocked...");
+    {
-    return aStreams.getSize();
+        blankBlock( iBlockId );
+    }
 }
-int Bu::Myriad::getBlockSize()
+void Bu::Myriad::blankBlock( int32_t iBlockId )
 {
-    return iBlockSize;
+    Bu::MutexLocker l( mBacking );
+    rBacking.setPos( iBlockId*iBlockSize );
+    int32_t iChunk = std::min( iBlockSize, 4096 );
+    uint8_t *pChunk = new uint8_t[iChunk];
+    memset( pChunk, 0, iChunk );
+    int iLeft = iBlockSize;
+    while( iLeft > 0 )
+    {
+        int32_t iWrite = rBacking.write( pChunk, std::min( iChunk, iLeft ) );
+        iLeft -= iWrite;
+    }
+    delete[] pChunk;
 }
-int Bu::Myriad::getNumBlocks()
+void Bu::Myriad::openStream( StreamId id )
 {
-    return iBlocks;
+    Bu::MutexLocker l( mhStream );
+    hStream.get( id )->open();
 }
-int Bu::Myriad::getNumUsedBlocks()
+void Bu::Myriad::closeStream( StreamId id )
 {
-    return iUsed;
+    Bu::MutexLocker l( mhStream );
+    hStream.get( id )->close();
 }
-Bu::size Bu::Myriad::getTotalUsedBytes()
+int32_t Bu::Myriad::blockRead( int32_t iBlock, int32_t iStart,
+        void *pTarget, int32_t iSize )
 {
-    MutexLocker mLock( mHeader );
+    int32_t iUpperSize = iBlockSize - (iStart%iBlockSize);
-    TRACE("mHeader locked.");
+/*    Bu::println("Max read within block: %1 vs %2  (start=%3, blocksize=%4)")
+        .arg( iUpperSize ).arg( iSize )
+        .arg( iStart ).arg( iBlockSize );
+*/
+    int32_t iAmnt = std::min( iSize, iUpperSize );
+    Bu::MutexLocker l( mBacking );
+    rBacking.setPos( iBlockSize*iBlock + iStart );
-    Bu::size iTotalSize = 0;
+    return rBacking.read( pTarget, iAmnt );
-    for( StreamArray::iterator i = aStreams.begin(); i; i++ )
-    {
-        iTotalSize += (*i)->iSize;
-    }
-    TRACE("mHeader unlocked...");
-    return iTotalSize;
 }
-Bu::size Bu::Myriad::getTotalUnusedBytes()
+int32_t Bu::Myriad::blockWrite( int32_t iBlock, int32_t iStart,
+        const void *pTarget, int32_t iSize )
 {
-    MutexLocker mLock( mHeader );
+    int32_t iUpperSize = iBlockSize - (iStart%iBlockSize);
-    TRACE("mHeader locked.");
+/*    Bu::println("Max write within block: %1 vs %2  (start=%3, blocksize=%4)")
+        .arg( iUpperSize ).arg( iSize )
+        .arg( iStart ).arg( iBlockSize );
+*/
+    int32_t iAmnt = std::min( iSize, iUpperSize );
+    Bu::MutexLocker l( mBacking );
+    rBacking.setPos( iBlock*iBlockSize + iStart );
-    Bu::size iTotalSize = (iBlocks-iUsed)*iBlockSize;
+    return rBacking.write( pTarget, iAmnt );
-    for( StreamArray::iterator i = aStreams.begin(); i; i++ )
-    {
-        iTotalSize += iBlockSize - ((Bu::size)(*i)->iSize%iBlockSize);
-    }
-    TRACE("mHeader unlocked...");
-    return iTotalSize;
 }
-Bu::size Bu::Myriad::getTotalUnusedBytes( int iFakeBlockSize )
+/////////
-{
+// Bu::Myriad::Stream
-    MutexLocker mLock( mHeader );
+//
-    TRACE("mHeader locked.");
-    Bu::size iTotalSize = (iBlocks-iUsed)*iFakeBlockSize;
+Bu::Myriad::Stream::Stream( Bu::Myriad &rParent, Bu::Myriad::StreamId iStream,
-    for( StreamArray::iterator i = aStreams.begin(); i; i++ )
+        int32_t iSize ) :
-    {
+    rParent( rParent ),
-        iTotalSize += iFakeBlockSize - ((*i)->iSize%iFakeBlockSize);
+    iStream( iStream ),
-    }
+    iSize( iSize ),
-    TRACE("mHeader unlocked...");
+    iOpenCount( 0 )
-    return iTotalSize;
+{
 }
-Bu::Myriad::Stream *Bu::Myriad::findStream( int iId )
+Bu::Myriad::Stream::~Stream()
 {
-    for( StreamArray::iterator i = aStreams.begin(); i; i++ )
-    {
-        if( (*i)->iId == iId )
-            return *i;
-    }
-    throw MyriadException( MyriadException::noSuchStream,
-        "The requested stream doesn't exist and cannot be opened." );
-    return NULL;
 }
-Bu::Myriad::Block *Bu::Myriad::getBlock( int iBlock )
+int32_t Bu::Myriad::Stream::getSize() const
 {
-//  sio << "Myriad:  Reading block " << iBlock << ", bytes "
+    Bu::MutexLocker l( mAccess );
-//      << iBlockSize*iBlock << "-" << iBlockSize*(iBlock+1) << sio.nl;
+    return iSize;
-    Block *pBlock = new Block;
+}
-    pBlock->pData = new char[iBlockSize];
-    sStore.setPos( iBlockSize * (Bu::size)iBlock );
-    sStore.read( pBlock->pData, iBlockSize );
-    pBlock->bChanged = false;
-    pBlock->iBlockIndex = iBlock;
-    mActiveBlocks.lock();
-    TRACE("mHeader locked.");
-    hActiveBlocks.insert( iBlock, pBlock );
-    TRACE("mHeader unlocked...");
-    mActiveBlocks.unlock();
-    return pBlock;
+int32_t Bu::Myriad::Stream::getBlockSize() const
+{
+    Bu::MutexLocker l( mAccess );
+    return rParent.iBlockSize;
 }
-void Bu::Myriad::releaseBlock( Bu::Myriad::Block *pBlock )
+Bu::Myriad::StreamId Bu::Myriad::Stream::getStreamId() const
 {
-    if( pBlock == NULL )
+    return iStream;
-        return;
+}
-//  sio << "Myriad:  Releasing block " << pBlock->iBlockIndex << sio.nl;
-    syncBlock( pBlock );
-    mActiveBlocks.lock();
-    TRACE("mHeader locked.");
-    hActiveBlocks.erase( pBlock->iBlockIndex );
-    TRACE("mHeader unlocked...");
-    mActiveBlocks.unlock();
-    delete[] pBlock->pData;
+int32_t Bu::Myriad::Stream::getOpenCount() const
-    delete pBlock;
+{
+    Bu::MutexLocker l( mAccess );
+    return iOpenCount;
 }
-void Bu::Myriad::syncBlock( Block *pBlock )
+void Bu::Myriad::Stream::setSize( int32_t iNewSize )
 {
-    if( pBlock->bChanged )
+    // Two possible modes, shrink or grow.
+    Bu::MutexLocker l( mAccess );
+    int iNewBlocks = Bu::blkDiv( iNewSize, rParent.iBlockSize );
+    if( iNewSize < iSize )
    {
-//      sio << "Myriad:    - Block changed, writing back to stream." << sio.nl;
+        // Shrink it
-        sStore.setPos( iBlockSize * (Bu::size)pBlock->iBlockIndex );
+        while( aBlocks.getSize() > iNewBlocks )
-        sStore.write( pBlock->pData, iBlockSize );
+        {
-        pBlock->bChanged = false;
+            rParent.releaseBlock( aBlocks.last(), false );
+            aBlocks.eraseLast();
+        }
+        iSize = iNewSize;
+    }
+    else if( iNewSize > iSize )
+    {
+        // Grow it
+        while( aBlocks.getSize() < iNewBlocks )
+        {
+            aBlocks.append( rParent.allocateBlock() );
+        }
+        iSize = iNewSize;
    }
 }
-int Bu::Myriad::streamAddBlock( Stream *pStream )
+int32_t Bu::Myriad::Stream::read( int32_t iStart, void *pTarget,
+        int32_t iSize )
 {
-    MutexLocker mLock( mHeader );
+    int32_t iRead = 0;
-    TRACE("mHeader locked.");
+    Bu::MutexLocker l( mAccess );
-    int iBlock = findEmptyBlock();
+    if( iStart >= this->iSize )
-    pStream->aBlocks.append( iBlock );
+        return 0;
-//  bsBlockUsed.setBit( iBlock );
-//  bHeaderChanged = true;
-    iUsed++;
-    TRACE("mHeader unlocked...");
-    return iBlock;
-}
-void Bu::Myriad::setStreamSize( Stream *pStream, long iSize )
-{
-    MutexLocker mLock( mHeader );
-    TRACE("mHeader locked.");
-    if( pStream->iSize == iSize )
+    if( iStart+iSize >= this->iSize )
    {
-    TRACE("mHeader unlocked...");
+        iSize = this->iSize-iStart;
-        return;
    }
-    else if( pStream->iSize > iSize )
+    while( iSize > 0 )
    {
-        // Shrink
+        int32_t iBlock = aBlocks[iStart/rParent.iBlockSize];
-        TRACE(Bu::String("Shrink stream %1 from %2 to %3").arg(pStream->iId).arg(pStream->iSize).arg(iSize).end() );
+        int32_t iChunkRead = rParent.blockRead(
-        for( int iNewSize = pStream->aBlocks.getSize()*iBlockSize;
+                iBlock, iStart%rParent.iBlockSize, pTarget, iSize
-             iNewSize-iBlockSize > iSize; iNewSize -= iBlockSize )
+                );
-        {
+        if( iChunkRead == 0 )
-//          if( bsBlockUsed.getBit( pStream->aBlocks.last() ) )
+            break;
-                iUsed--;
+        iRead += iChunkRead;
-//          else
+        iStart += iChunkRead;
-//              sio << "Unused block used in stream? " << pStream->aBlocks.last() << sio.nl;
+        reinterpret_cast<ptrdiff_t &>(pTarget) += iChunkRead;
-            lFreeBlocks.enqueue( pStream->aBlocks.last() );
+        iSize -= iChunkRead;
-//          bsBlockUsed.setBit( pStream->aBlocks.last(), false );
-            pStream->aBlocks.eraseLast();
-        }
-        pStream->iSize = iSize;
-        bHeaderChanged = true;
    }
-    else
+    return iRead;
+}
+int32_t Bu::Myriad::Stream::write( int32_t iStart, const void *pTarget,
+        int32_t iSize )
+{
+    int32_t iWrite = 0;
+    Bu::MutexLocker l( mAccess );
+    while( iSize > 0 )
    {
-        // Grow
+        int32_t iBlockIdx = iStart/rParent.iBlockSize;
-        TRACE(Bu::String("Grow stream %1 from %2 to %3").arg(pStream->iId).arg(pStream->iSize).arg(iSize).end() );
+        while( iBlockIdx >= aBlocks.getSize() )
-        for( int iNewSize = pStream->aBlocks.getSize()*iBlockSize;
-             iNewSize < iSize; iNewSize += iBlockSize )
        {
-            //streamAddBlock( pStream );
+            aBlocks.append( rParent.allocateBlock() );
-            int iBlock = findEmptyBlock();
-            pStream->aBlocks.append( iBlock );
-//          bsBlockUsed.setBit( iBlock );
-//          bHeaderChanged = true;
-            iUsed++;
        }
-        pStream->iSize = iSize;
+        int32_t iBlock = aBlocks[iBlockIdx];
-        bHeaderChanged = true;
+        int32_t iChunkWrite = rParent.blockWrite(
+                iBlock, iStart%rParent.iBlockSize, pTarget, iSize
+                );
+        if( iChunkWrite == 0 )
+            break;
+        iWrite += iChunkWrite;
+        iStart += iChunkWrite;
+        reinterpret_cast<ptrdiff_t &>(pTarget) += iChunkWrite;
+        iSize -= iChunkWrite;
    }
-    TRACE("mHeader unlocked...");
+    if( this->iSize < iStart )
+        this->iSize = iStart;
+    return iWrite;
 }
-void Bu::Myriad::headerChanged()
+Bu::String Bu::Myriad::Stream::getLocation() const
 {
-    bHeaderChanged = true;
+    Bu::MutexLocker l( mAccess );
+    return Bu::String("%1:stream %2")\
+        .arg( rParent.getLocation() ).arg( iStream );
 }
-bool Bu::Myriad::isMyriad( Bu::Stream &sStore )
+Bu::Array<int32_t> Bu::Myriad::Stream::getBlockList() const
 {
-    uint8_t uTmp;
+    Bu::MutexLocker l( mAccess );
+    return aBlocks.clone();
-    return isMyriad( sStore, uTmp );
 }
-bool Bu::Myriad::isMyriad( Bu::Stream &sStore, uint8_t &uTmp )
+void Bu::Myriad::Stream::open()
 {
-    sStore.setPos( 0 );
+    Bu::MutexLocker l( mAccess );
+    iOpenCount++;
-    unsigned char buf[4];
-    if( sStore.read( buf, 4 ) < 4 )
-        throw MyriadException( MyriadException::emptyStream,
-                "Input stream appears to be empty.");
-    sStore.read( &uTmp, 1 );
-    sStore.setPos( 0 );
-    if( memcmp( buf, Myriad_MAGIC_CODE, 4 ) )
-    {
-        return false;
-    }
-    return true;
 }
-const Bu::BitString Bu::Myriad::getBlocksUsed() const
+bool Bu::Myriad::Stream::close()
 {
-    Bu::BitString bs( iBlocks, false );
+    Bu::MutexLocker l( mAccess );
-    for( int j = 0; j < iBlocks; j++ )
+    return (bool)(--iOpenCount);
-        bs.setBit( j );
-    for( IndexList::const_iterator i = lFreeBlocks.begin(); i; i++ )
-        bs.setBit( *i, false );
-    return bs;
 }
diff --git a/src/stable/myriad.h b/src/stable/myriad.h
index 14467a4..5accd1e 100644
--- a/src/stable/myriad.h
+++ b/src/stable/myriad.h
@@ -1,24 +1,16 @@
-/*
- * Copyright (C) 2007-2023 Xagasoft, All rights reserved.
- *
- * This file is part of the libbu++ library and is released under the
- * terms of the license contained in the file LICENSE.
- */
 #ifndef BU_MYRIAD_H
 #define BU_MYRIAD_H
-#include <stdint.h>
+#include "bu/stream.h"
-#include "bu/bitstring.h"
 #include "bu/exceptionbase.h"
+#include "bu/mutex.h"
 #include "bu/array.h"
 #include "bu/hash.h"
-#include "bu/mutex.h"
-#include "bu/extratypes.h"
+#include "bu/bitstring.h"
 namespace Bu
 {
-    class Stream;
    class MyriadStream;
    subExceptionDeclBegin( MyriadException )
@@ -31,206 +23,229 @@ namespace Bu
            noSuchStream,
            streamExists,
            invalidStreamId,
-            protectedStream
+            protectedStream,
+            invalidParameter,
+            invalidBackingStream,
+            badMode,
+            streamOpen,
        };
    subExceptionDeclEnd();
    /**
-     * Myriad block-allocated stream multiplexing system.  This is a system for
+     * Myriad Stream Multiplexer. This is a system that allows you to store
-     * creating streams that contain other streams in a flexible and lightweight
+     * many streams within a single backing stream. This is great for databases,
-     * manner.  Basically, you can create a file (or any other stream) that can
+     * caching, etc. It's fairly lightweight, and allows all streams to grow
-     * store any number of flexible, growing streams.  The streams within the
+     * dynamically using a block-allocation scheme.  This is used extensively
-     * Myriad stream are automatically numbered, not named.  This works more
+     * by the caching system and MyriadFs as well as other systems within
-     * or less like a filesystem, but without the extra layer for managing
+     * libbu++.
-     * file and directory links.  This would actually be very easy to add
-     * on top of Myriad, but is not required.
-     *
-     * Header format is as follows:
-     *
-     * MMMMvBssssSSSS*
-     * M = Magic number (0AD3FA84)
-     * v = version number
-     * B = Bits per int
-     * s = Blocksize in bytes
-     * S = Number of Streams
-     * 
-     * The * represents the Stream headers, one per stream, as follows:
-     * IIIIssss$
-     * I = Id number of the stream
-     * s = size of stream in bytes
-     *
-     * The $ represents the Block headers, one per used block, as  follows:
-     * IIII
-     * I = Index of the block
-     *
-     * The stream/block data is interleaved in the header, so all blocks stored
-     * with one stream are together.  The block headers are in order, and the
-     * data in them is required to be "solid" you cannot fill partial blocks
-     * mid-way through a stream.
-     *
-     * The initial block starts with the nids header, and is both the zero block
-     * and the zero stream.  For now, the minimum block size is the size needed
-     * to store the base header, the zero stream header, and the first two
-     * blocks of the zero stream, so 30 bytes.  Since it's reccomended to use
-     * a size that will fit evenly into filesystem blocks, then a size of 32 is
-     * probably the smallest reccomended size because all powers of two equal
-     * to or greater than 32 are evenly divisible by 32.
-     *
-     * I have had a thought that if the block size were smaller than 42 bytes
-     * the header would consume the first N blocks where N * block size is
-     * enough space to house the initial header, the first stream header, and
-     * the first N block headers.  This, of course, causes you to hit an
-     * infinite header if the block size is small enough.
     */
    class Myriad
    {
-        friend class MyriadStream;
+    public:
+        typedef int32_t StreamId;
+        typedef Bu::Array<StreamId> StreamIdArray;
+        typedef Bu::List<StreamId> StreamIdList;
+        enum Mode : int32_t {
+            None        = 0x00,
+            // Flags
+            Read        = 0x01, ///< Open file for reading
+            Write       = 0x02, ///< Open file for writing
+            Create      = 0x04, ///< Create file if it doesn't exist
+            Truncate    = 0x08, ///< Truncate file if it does exist
+            Append      = 0x10, ///< Start writing at end of file
+            //NonBlock    = 0x20, ///< Open file in non-blocking mode
+            Exclusive   = 0x40, ///< Create file, if it exists then fail
+            // Helpful mixes
+            ReadWrite   = 0x03, ///< Open for reading and writing
+            WriteNew    = 0x0E  ///< Create a file (or truncate) for writing.
+                                /// Same as Write|Create|Truncate
+        };
    public:
        /**
-         * Create a Myriad object that uses the given stream to store data.
+         * Open existing Myriad container, or initialize a new one if the
-         * This stream must be random access.  The block size and preallocate
+         * backing stream is empty. If other data is already in the provided
-         * values passed in are values that will be used if the given stream
+         * backing stream an error is thrown.
-         * is empty.  In that case the stream will be "formatted" for myriad
+         *
-         * with the specified block size.  If there is already a viable Myriad
+         * Myriad format V0
-         * format present in the stream, then the blocksize and preallocate
+         *   0 -   3:  Myriad_MAGIC_CODE (0ad3fa84)
-         * values will be ignored and the values from the stream will be used
+         *   4 -   4:  Version Id (1)
-         * instead.  If the stream doesn't appear to be Myriad formatted an
+         *   5 -   5:  Bits per integer (32)
-         * exception will be thrown.
+         *   6 -   9:  Block size in bytes.
+         *  10 -  13:  Number of streams.
+         *  14 - ...:  Stream Data
+         *
+         * Stream Data:
+         *   0 -   3:  Stream Id
+         *   4 -   7:  Size of stream in bytes
+         *   8 - ...:  List of blocks in stream (4 bytes per block
         */
-        Myriad( Bu::Stream &sStore, int iBlockSize=512, int iPreallocate=8 );
+        Myriad( Bu::Stream &rBacking, int32_t iBlockSize=-1,
+                int32_t iPreallocateBlocks=-1 );
        virtual ~Myriad();
        /**
-         * Destroy whatever data may be in the base stream and create a new
+         * Creates a new stream open in the specified eMode and, optionally,
-         * Myriad system there with the given blocksize.  Use this with care,
+         * preallocates the specificed amount of space. The stream is zero
-         * it will destroy anything that was already in the stream, and
+         * bytes even if space is preallocated. The open stream is returned,
-         * generally, should not ever have to be used.
+         * ready for use. Use this if you don't care what the id is of the
+         * newly created stream.
         */
-        void initialize( int iBlockSize, int iPreAllocate=1 );
+        MyriadStream create( Mode eMode, int32_t iPreallocateBytes=-1 );
        /**
-         * Create a new stream within the Myriad system.  The ID of the new
+         * Open an existing stream or create a new stream with the specified
-         * stream is returned.
+         * id (iStream) with the specified eMode. This respects the normal file
+         * modes, see Bu::Myriad::Mode for details.
         */
-        int createStream( int iPreAllocate=1 );
+        MyriadStream open( StreamId iStream, Mode eMode );
        /**
-         * Create a new stream within the Myriad system with a given id.  The
+         * Allocate a new stream but do not open it, just ensure it exists and
-         * id that you provide will be the new id of the stream unless it's
+         * return the id of the newly allocated stream.
-         * already used, in which case an error is thrown.  This is primarilly
-         * useful when copying an old Myriad file into a new one.
         */
-        int createStreamWithId( int iId, int iPreAllocate=1 );
+        StreamId allocate();
        /**
-         * Delete a stream that's already within the Myriad.
+         * Erase the stream specified by iStream. This only can work when the
+         * stream is not open at the moment.
         */
-        void deleteStream( int iId );
+        void erase( StreamId iStream );
+        void setSize( StreamId iStream, int32_t iNewSize );
+        int32_t getSize( StreamId iStream ) const;
+        bool exists( StreamId iStream ) const;
+        Bu::String getLocation() const;
+        int32_t getBlockSize() const;
+        int32_t getTotalBlocks() const;
+        int32_t getUsedBlocks() const;
+        int32_t getFreeBlocks() const;
+        int32_t getTotalStreams() const;
+        int32_t getTotalUsedBytes() const;
+        int32_t getTotalUnusedBytes( int32_t iAssumeBlockSize=-1 ) const;
+        Bu::BitString buildBlockUseMap() const;
+        StreamIdArray buildBlockMap() const;
+        
        /**
-         * Return a new Stream object assosiated with the given stream ID.
+         * Lists all stream ids that you are allowed to open. Technically there
+         * is always a zero stream, but it is used by Myriad for stream/block
+         * accounting. It works like a normal stream but you should not open
+         * it.
         */
-        MyriadStream openStream( int iId );
+        StreamIdList getStreamList() const;
-        Bu::Array<int> getStreamIds();
-        int getStreamSize( int iId );
-        bool hasStream( int iId );
-        int getNumStreams();
-        int getBlockSize();
-        int getNumBlocks();
-        int getNumUsedBlocks();
-        Bu::size getTotalUsedBytes();
-        Bu::size getTotalUnusedBytes();
-        Bu::size getTotalUnusedBytes( int iFakeBlockSize );
        /**
-         * Syncronize the header data, etc. with the storage stream.  It's not
+         * Flush all caches to the backing stream, write all structural and
-         * a bad idea to call this periodically.
+         * header changes.
         */
        void sync();
+    private:
+        bool loadMyriad();
+        void createMyriad( int32_t iBlockSize, int32_t iPreallocateBlocks );
+        void writeHeader();
+        int32_t __calcHeaderSize();
+        int32_t allocateBlock();
+        int32_t __allocateBlock();
+        void releaseBlock( int32_t iBlockId, bool bBlank=true );
+        void __releaseBlock( int32_t iBlockId, bool bBlank=true );
+        void blankBlock( int32_t iBlockId );
+        void openStream( StreamId id );
+        void closeStream( StreamId id );
        /**
-         * Read the first few bytes from the given stream and return true/false
+         * Block restricted read, it will not read past the end of the block
-         * depending on weather or not it's a Myriad stream.  This will throw
+         * that iStart places it in.
-         * an exception if the stream is empty, or is not random access.
         */
-        static bool isMyriad( Bu::Stream &sStore, uint8_t &uVer );
+        int32_t blockRead( int32_t iBlock, int32_t iStart,
-        
+                void *pTarget, int32_t iSize );
        /**
-         * Read the first few bytes from the given stream and return true/false
+         * Block restricted write, it will not write past the end of the block
-         * depending on weather or not it's a Myriad stream.  This will throw
+         * that iStart places it in. If this returns a non-zero number it's an
-         * an exception if the stream is empty, or is not random access.
+         * indication that you need to allocate a new block.
         */
-        static bool isMyriad( Bu::Stream &sStore );
+        int32_t blockWrite( int32_t iBlock, int32_t iStart,
+                const void *pTarget, int32_t iSize );
-        const Bu::BitString getBlocksUsed() const;
+    public:
-    private:
        /**
-         * Initialize this object based on the data already in the assosiated
+         * Bridge/communication/tracking class for individual Myriad streams.
-         * stream.  This will be called automatically for you if you forget,
+         * Not for general use, this is used by Myriad and MyriadStream to
-         * but if you want to pre-initialize for some reason, just call this
+         * control access.
-         * once before you actually start doing anything with your Myriad.
         */
-        void initialize();
-        enum
-        {
-            blockUnused =   0xFFFFFFFFUL
-        };
-        
-        typedef Bu::Array<int> BlockArray;
        class Stream
        {
-        public:
+        friend Bu::Myriad;
-            int iId;
+        private:
-            int iSize;
+            Stream( Myriad &rParent, StreamId iStream, int32_t iSize );
-            BlockArray aBlocks;
+            virtual ~Stream();
-        };
-        typedef Bu::Array<Stream *> StreamArray;
-        class Block
-        {
        public:
-            char *pData;
+            int32_t getSize() const;
-            bool bChanged;
+            int32_t getBlockSize() const;
-            int iBlockIndex;
+            StreamId getStreamId() const;
+            int32_t getOpenCount() const;
+            void setSize( int32_t iNewSize );
+            int32_t read( int32_t iStart, void *pTarget, int32_t iSize );
+            int32_t write( int32_t iStart, const void *pTarget, int32_t iSize );
+            Bu::String getLocation() const;
+            Bu::Array<int32_t> getBlockList() const;
+            /**
+             * Doesn't actually open, just increments the open counter.
+             * If the open counter is non-zero then at least one stream has
+             * a lock on this stream.
+             */
+            void open();
+            /**
+             * Doesn't actually close, just decrements the open counter.
+             *@returns true if there are still handles open, false if no
+             * streams have a lock.
+             */
+            bool close();
+        private:
+            mutable Bu::Mutex mAccess;
+            Myriad &rParent;
+            StreamId iStream;
+            int32_t iSize;
+            Bu::Array<int32_t> aBlocks;
+            int32_t iOpenCount;
        };
-        void updateHeader();
-        int findEmptyBlock();
-        /**
-         *@todo Change this to use a binary search, it's nicer.
-         */
-        Stream *findStream( int iId );
-        Block *getBlock( int iBlock );
-        void releaseBlock( Block *pBlock );
-        void syncBlock( Block *pBlock );
-        int streamAddBlock( Stream *pStream );
-        void setStreamSize( Stream *pStream, long iSize );
-        void headerChanged();
    private:
-        Bu::Stream &sStore;
+        typedef Bu::Hash<StreamId, Stream *> StreamHash;
-        int iBlockSize;
+        typedef Bu::List<int32_t> IndexList;
-        int iBlocks;
+        mutable Bu::Mutex mAccess;
-        int iUsed;
+        mutable Bu::Mutex mBacking;
-        typedef Bu::List<int> IndexList;
+        Bu::Stream &rBacking;
+        int32_t iBlockSize;
+        int32_t iBlockCount;
+        bool bIsNewStream;
+        bool bStructureChanged;
+        mutable Bu::Mutex mhStream;
+        StreamHash hStream;
        IndexList lFreeBlocks;
-//      Bu::BitString bsBlockUsed;
+        StreamId iLastUsedIndex;
-        StreamArray aStreams;
-        typedef Bu::Hash<int, Block *> BlockHash;
-        BlockHash hActiveBlocks;
-        bool bHeaderChanged;
-        Bu::Mutex mHeader;
-        Bu::Mutex mActiveBlocks;
    };
+    constexpr Myriad::Mode operator&( Myriad::Mode a, Myriad::Mode b )
+    {
+        return static_cast<Myriad::Mode>(
+            static_cast<std::underlying_type<Myriad::Mode>::type>(a) &
+            static_cast<std::underlying_type<Myriad::Mode>::type>(b)
+            );
+    }
+    constexpr Myriad::Mode operator|( Myriad::Mode a, Myriad::Mode b )
+    {
+        return static_cast<Myriad::Mode>(
+            static_cast<std::underlying_type<Myriad::Mode>::type>(a) |
+            static_cast<std::underlying_type<Myriad::Mode>::type>(b)
+            );
+    }
 };
 #endif
diff --git a/src/stable/myriadstream.cpp b/src/stable/myriadstream.cpp
index 50c6924..eaf91a5 100644
--- a/src/stable/myriadstream.cpp
+++ b/src/stable/myriadstream.cpp
@@ -1,248 +1,96 @@
-/*
- * Copyright (C) 2007-2023 Xagasoft, All rights reserved.
- *
- * This file is part of the libbu++ library and is released under the
- * terms of the license contained in the file LICENSE.
- */
 #include "bu/myriadstream.h"
-#include <string.h>
+#include "bu/mutexlocker.h"
-// #define MYRIAD_STREAM_DEBUG  1
-#ifdef MYRIAD_STREAM_DEBUG
-#include "bu/sio.h"
-using Bu::sio;
-using Bu::Fmt;
-#endif
-#include "bu/sio.h"
-#define TRACE( x ) Bu::println("%1:%2: %3: %4 - %5").arg(__FILE__).arg( __LINE__ ).arg(__PRETTY_FUNCTION__).arg(rMyriad.sStore.getLocation()).arg(x)
 Bu::MyriadStream::MyriadStream( Bu::Myriad &rMyriad,
-        Bu::Myriad::Stream *pStream ) :
+        Bu::Myriad::Stream *pStream, Bu::Myriad::Mode eMode ) :
    rMyriad( rMyriad ),
    pStream( pStream ),
-    pCurBlock( NULL ),
+    eMode( eMode ),
    iPos( 0 )
 {
-#ifdef MYRIAD_STREAM_DEBUG
+    if( (eMode&Bu::Myriad::ReadWrite) == 0 )
-    sio << "MyriadStream: " << __LINE__ << ": Created, iId=" << pStream->iId << ", iSize="
+    {
-        << pStream->iSize << sio.nl;
+        throw Bu::MyriadException( Bu::MyriadException::invalidParameter,
-#endif
+                "MyriadStream must be opened Read or Write or both.");
-    //pCurBlock = rMyriad.newBlock();
+    }
-    //rMyriad.getBlock( uStream, pCurBlock );
+    Bu::MutexLocker l( mAccess );
-    //uSize = pCurBlock->uBytesUsed;
+    pStream->open();
+    if( (eMode&Bu::Myriad::Write) != 0 )
+    {
+        // Writing mode, what other options do we deal with?
+        if( (eMode&Bu::Myriad::Truncate) != 0 )
+        {
+            // Truncate, set size to zero before starting.
+            pStream->setSize( 0 );
+        }
+        else if( (eMode&Bu::Myriad::Append) != 0 )
+        {
+            iPos = pStream->getSize();
+        }
+    }
 }
 Bu::MyriadStream::~MyriadStream()
 {
-    if( pCurBlock )
+    close();
-        rMyriad.releaseBlock( pCurBlock );
-    //rMyriad.updateStreamSize( uStream, uSize );
-    //rMyriad.deleteBlock( pCurBlock );
 }
 void Bu::MyriadStream::close()
 {
-}
+    Bu::MutexLocker l( mAccess );
+    if( eMode )
-Bu::size Bu::MyriadStream::read( void *pBuf, Bu::size nBytes )
-{
-#ifdef MYRIAD_STREAM_DEBUG
-    sio << "MyriadStream: read: " << __LINE__ << ": Started, asked to read " << nBytes << "b."
-        << sio.nl;
-#endif
-    if( nBytes > (Bu::size)pStream->iSize-iPos )
-        nBytes = pStream->iSize-iPos;
-    if( nBytes <= 0 )
-        return 0;
-    int iLeft = nBytes;
-#ifdef MYRIAD_STREAM_DEBUG
-    sio << "MyriadStream: read: " << __LINE__ << ": Started, going to read " << nBytes << "b."
-        << sio.nl;
-#endif
-    if( pCurBlock == NULL )
    {
-#ifdef MYRIAD_STREAM_DEBUG
+        pStream->close();
-        sio << "MyriadStream: read: " << __LINE__ << ": No block loaded, loading initial block."
+        eMode = Bu::Myriad::None;
-            << sio.nl;
-#endif
-        pCurBlock = rMyriad.getBlock(
-            pStream->aBlocks[iPos/rMyriad.iBlockSize]
-            );
-    }
-    while( iLeft > 0 )
-    {
-        int iCurBlock = pStream->aBlocks[iPos/rMyriad.iBlockSize];
-        if( pCurBlock->iBlockIndex != iCurBlock )
-        {
-#ifdef MYRIAD_STREAM_DEBUG
-            sio << "MyriadStream: read: " << __LINE__ << ": Loading new block " << iCurBlock << "."
-                << sio.nl;
-#endif
-            rMyriad.releaseBlock( pCurBlock );
-            pCurBlock = rMyriad.getBlock( iCurBlock );
-        }
-        int iAmnt = Bu::buMin(
-            Bu::buMin(
-                rMyriad.iBlockSize - iPos%rMyriad.iBlockSize,
-                iLeft
-                ),
-            pStream->iSize-iPos
-            );
-#ifdef MYRIAD_STREAM_DEBUG
-        sio << "MyriadStream: read: " << __LINE__ << ": Copying out bytes: "
-            << iPos << "(" << (iPos%rMyriad.iBlockSize) << ")+"
-            << iAmnt
-            << ", " << iLeft << "b left." << sio.nl;
-#endif
-        memcpy(
-            pBuf,
-            pCurBlock->pData+(iPos%rMyriad.iBlockSize),
-            iAmnt
-            );
-        iPos += iAmnt;
-        pBuf = &((char *)pBuf)[iAmnt];
-        iLeft -= iAmnt;
    }
-    return nBytes;
 }
-Bu::size Bu::MyriadStream::write( const void *pBuf, Bu::size nBytes )
+Bu::size Bu::MyriadStream::read( void *pBuf, size iBytes )
 {
-    if( nBytes <= 0 )
+    Bu::MutexLocker l( mAccess );
-        return 0;
+    int32_t iRead = pStream->read( iPos, pBuf, iBytes );
+    iPos += iRead;
-#ifdef MYRIAD_STREAM_DEBUG
+    return iRead;
-    sio << "MyriadStream: write: " << __LINE__ << ": Started, asked to write " << nBytes << "b."
+}
-        << sio.nl;
-#endif
-    if( nBytes <= 0 )
-        return 0;
-    int iLeft = nBytes;
-    /*
-    if( pCurBlock == NULL )
-    {
-#ifdef MYRIAD_STREAM_DEBUG
-        sio << "MyriadStream: write: No block loaded, loading initial block."
-            << sio.nl;
-#endif
-        pCurBlock = rMyriad.getBlock(
-            pStream->aBlocks[iPos/rMyriad.iBlockSize]
-            );
-    }*/
-    
-    while( iLeft > 0 )
-    {
-        int iCurBlock;
-        if( iPos/rMyriad.iBlockSize < pStream->aBlocks.getSize() )
-        {
-            iCurBlock = pStream->aBlocks[iPos/rMyriad.iBlockSize];
-        }
-        else
-        {
-            iCurBlock = rMyriad.streamAddBlock( pStream );
-#ifdef MYRIAD_STREAM_DEBUG
-            sio << "MyriadStream: write: " << __LINE__ << ": New block allocated and appended: "
-                << iCurBlock << "." << sio.nl;
-#endif
-        }
-        if( !pCurBlock || pCurBlock->iBlockIndex != iCurBlock )
-        {
-#ifdef MYRIAD_STREAM_DEBUG
-            sio << "MyriadStream: write: " << __LINE__ << ": Loading new block " << iCurBlock << "."
-                << sio.nl;
-#endif
-            rMyriad.releaseBlock( pCurBlock );
-            pCurBlock = rMyriad.getBlock( iCurBlock );
-        }
-        pCurBlock->bChanged = true;
-        
-        // There are two main writing modes when it comes down to it.
-        // Overwrite mode and append mode.  Append is what pretty much always
-        // happens when creating a new stream.
-        if( iPos < pStream->iSize )
-        {
-            int iAmnt = Bu::buMin(
-                Bu::buMin(
-                    rMyriad.iBlockSize - iPos%rMyriad.iBlockSize,
-                    iLeft
-                    ),
-                pStream->iSize-iPos
-                );
-#ifdef MYRIAD_STREAM_DEBUG
-            sio << "MyriadStream: write (ovr): " << __LINE__ << ": Copying in bytes: "
-                << (iPos%rMyriad.iBlockSize) << "+"
-                << iAmnt
-                << ", " << iLeft << "b left." << sio.nl;
-#endif
-            memcpy(
-                pCurBlock->pData+(iPos%rMyriad.iBlockSize),
-                pBuf,
-                iAmnt
-                );
-            iPos += iAmnt;
-            pBuf = &((char *)pBuf)[iAmnt];
-            iLeft -= iAmnt;
-        }
-        else
-        {
-            int iAmnt = Bu::buMin(
-                rMyriad.iBlockSize - iPos%rMyriad.iBlockSize,
-                iLeft
-                );
-#ifdef MYRIAD_STREAM_DEBUG
-            sio << "MyriadStream: write (app): " << __LINE__ << ": Copying in bytes: "
-                << (iPos%rMyriad.iBlockSize) << "+"
-                << iAmnt
-                << ", " << iLeft << "b left." << sio.nl;
-#endif
-            memcpy(
-                pCurBlock->pData+(iPos%rMyriad.iBlockSize),
-                pBuf,
-                iAmnt
-                );
-            iPos += iAmnt;
-            TRACE(Bu::String("Stream=%1 - pStream->iSize(%2) += iAmnt(%3)").arg(pStream->iId).arg( pStream->iSize ).arg(iAmnt).end());
-            pStream->iSize += iAmnt;
-            TRACE(Bu::String("Stream=%1 - pStream->iSize = %2").arg(pStream->iId).arg( pStream->iSize ).end());
-            rMyriad.headerChanged();
-            pBuf = &((char *)pBuf)[iAmnt];
-            iLeft -= iAmnt;
-        }
-    }
-    return nBytes;
+Bu::size Bu::MyriadStream::write( const void *pBuf, size iBytes )
+{
+    Bu::MutexLocker l( mAccess );
+    int32_t iWrite = pStream->write( iPos, pBuf, iBytes );
+    iPos += iWrite;
+    return iWrite;
 }
 Bu::size Bu::MyriadStream::tell()
 {
+    Bu::MutexLocker l( mAccess );
    return iPos;
 }
-void Bu::MyriadStream::seek( Bu::size offset )
+void Bu::MyriadStream::seek( size offset )
 {
+    Bu::MutexLocker l( mAccess );
    iPos += offset;
 }
-void Bu::MyriadStream::setPos( Bu::size pos )
+void Bu::MyriadStream::setPos( size pos )
 {
+    Bu::MutexLocker l( mAccess );
    iPos = pos;
 }
-void Bu::MyriadStream::setPosEnd( Bu::size pos )
+void Bu::MyriadStream::setPosEnd( size pos )
 {
-    iPos = pStream->iSize-pos;
+    Bu::MutexLocker l( mAccess );
+    iPos = pStream->getSize()-pos;
 }
 bool Bu::MyriadStream::isEos()
 {
-    return iPos >= pStream->iSize;
+    Bu::MutexLocker l( mAccess );
+    return iPos == pStream->getSize();
 }
 bool Bu::MyriadStream::isOpen()
@@ -252,6 +100,7 @@ bool Bu::MyriadStream::isOpen()
 void Bu::MyriadStream::flush()
 {
+    // Does this make sense?
 }
 bool Bu::MyriadStream::canRead()
@@ -266,12 +115,14 @@ bool Bu::MyriadStream::canWrite()
 bool Bu::MyriadStream::isReadable()
 {
-    return true;
+    Bu::MutexLocker l( mAccess );
+    return (eMode&Bu::Myriad::Read) != 0;
 }
 bool Bu::MyriadStream::isWritable()
 {
-    return true;
+    Bu::MutexLocker l( mAccess );
+    return (eMode&Bu::Myriad::Write) != 0;
 }
 bool Bu::MyriadStream::isSeekable()
@@ -286,29 +137,38 @@ bool Bu::MyriadStream::isBlocking()
 void Bu::MyriadStream::setBlocking( bool /*bBlocking*/ )
 {
+    // Dunno what this would even mean here.
 }
-void Bu::MyriadStream::setSize( Bu::size iSize )
+void Bu::MyriadStream::setSize( size iSize )
 {
-    if( iSize < 0 )
+    Bu::MutexLocker l( mAccess );
-        iSize = 0;
+    pStream->setSize( iSize );
-    rMyriad.setStreamSize( pStream, iSize );
    if( iPos > iSize )
        iPos = iSize;
 }
 Bu::size Bu::MyriadStream::getSize() const
 {
-    return pStream->iSize;
+    Bu::MutexLocker l( mAccess );
+    return pStream->getSize();
 }
 Bu::size Bu::MyriadStream::getBlockSize() const
 {
-    return rMyriad.getBlockSize();
+    Bu::MutexLocker l( mAccess );
+    return pStream->getBlockSize();
 }
 Bu::String Bu::MyriadStream::getLocation() const
 {
-    return Bu::String("%1").arg( pStream->iId );
+    Bu::MutexLocker l( mAccess );
+    return pStream->getLocation();
+}
+Bu::Myriad::StreamId Bu::MyriadStream::getId() const
+{
+    Bu::MutexLocker l( mAccess );
+    return pStream->getStreamId();
 }
diff --git a/src/stable/myriadstream.h b/src/stable/myriadstream.h
index a94a9a2..27a15d5 100644
--- a/src/stable/myriadstream.h
+++ b/src/stable/myriadstream.h
@@ -1,38 +1,30 @@
-/*
- * Copyright (C) 2007-2023 Xagasoft, All rights reserved.
- *
- * This file is part of the libbu++ library and is released under the
- * terms of the license contained in the file LICENSE.
- */
 #ifndef BU_MYRIAD_STREAM_H
 #define BU_MYRIAD_STREAM_H
 #include "bu/stream.h"
+#include "bu/myriadstream.h"
 #include "bu/myriad.h"
 namespace Bu
 {
    class MyriadStream : public Bu::Stream
    {
-        friend class Myriad;
+    friend class Myriad;
    private:
-        /**
+        MyriadStream( Bu::Myriad &rMyriad, Bu::Myriad::Stream *pStream,
-         * These can only be created by the Myriad class.
+                Bu::Myriad::Mode eMode );
-         */
-        MyriadStream( Myriad &rMyriad, Myriad::Stream *pStream );
    public:
        virtual ~MyriadStream();
+    
+    public:
        virtual void close();
-        virtual Bu::size read( void *pBuf, Bu::size nBytes );
+        virtual size read( void *pBuf, size iBytes );
-        virtual Bu::size write( const void *pBuf, Bu::size nBytes );
+        virtual size write( const void *pBuf, size iBytes );
        using Stream::write;
-        virtual Bu::size tell();
+        virtual size tell();
-        virtual void seek( Bu::size offset );
+        virtual void seek( size offset );
-        virtual void setPos( Bu::size pos );
+        virtual void setPos( size pos );
-        virtual void setPosEnd( Bu::size pos );
+        virtual void setPosEnd( size pos );
        virtual bool isEos();
        virtual bool isOpen();
        virtual void flush();
@@ -43,18 +35,18 @@ namespace Bu
        virtual bool isSeekable();
        virtual bool isBlocking();
        virtual void setBlocking( bool bBlocking=true );
-        virtual void setSize( Bu::size iSize );
+        virtual void setSize( size iSize );
        virtual size getSize() const;
        virtual size getBlockSize() const;
        virtual Bu::String getLocation() const;
+        Myriad::StreamId getId() const;
    private:
-        Myriad &rMyriad;
+        mutable Bu::Mutex mAccess;
-        Myriad::Stream *pStream;
+        Bu::Myriad &rMyriad;
-        Myriad::Block *pCurBlock;
+        Bu::Myriad::Stream *pStream;
-        int iBlockSize;
+        Bu::Myriad::Mode eMode;
-        int iPos; 
+        int32_t iPos;
    };
 };
diff --git a/src/tests/bigmyriad.cpp b/src/tests/bigmyriad.cpp
index 9af301c..73a3315 100644
--- a/src/tests/bigmyriad.cpp
+++ b/src/tests/bigmyriad.cpp
@@ -5,16 +5,17 @@
 int main()
 {
    Bu::File f("big.myr", Bu::File::Read|Bu::File::Write|Bu::File::Create );
-    Bu::Myriad m( f, 2048 );
+    Bu::Myriad m( f, 512, 12 );
-    char *buf = new char[1024*1024*10];
+#define SSIZE (1024*8) // 1024*1024*10
-    memset( buf, 0, 1024*1024*10 );
+    char *buf = new char[SSIZE];
-    for( int j = 0; j < 250; j++ )
+    for( int j = 0; j < 25; j++ )
    {
-        m.openStream( m.createStream() ).write( buf, 1024*1024*10 );
+        memset( buf, j, SSIZE );
-//      m.sync();
+        m.create( Bu::Myriad::Write ).write( buf, SSIZE );
-        printf("\r%03d%%", (j+1)*100/250 );
+//        m.sync();
+        printf("\r%03d%%", (j+1)*100/25 );
        fflush( stdout );
    }
diff --git a/src/tests/cachedel.cpp b/src/tests/cachedel.cpp
index 817757c..f4cb1b5 100644
--- a/src/tests/cachedel.cpp
+++ b/src/tests/cachedel.cpp
@@ -21,6 +21,12 @@ public:
    virtual ~Something()
    {
+        //Bu::println("Deleting %1").arg( this->toString() );
+    }
+    void sayHi()
+    {
+        Bu::println("Hello %1").arg( toString() );
    }
    virtual Bu::Uuid getKey() const
@@ -39,7 +45,7 @@ public:
        changed();
    }
-    virtual Bu::String toString() const=0;
+    virtual Bu::String toString() const=0;// { return Bu::String("ERROR"); };
 private:
    Bu::Uuid uId;
@@ -60,6 +66,11 @@ public:
        iNumber( iNumber )
    {
    }
+    virtual ~SubSomethingA()
+    {
+        Bu::println("Deleting-A %1").arg( this->toString() );
+    }
    
    virtual Bu::String toString() const
    {
@@ -84,6 +95,10 @@ public:
        sString( sString )
    {
    }
+    virtual ~SubSomethingB()
+    {
+    }
    
    virtual Bu::String toString() const
    {
@@ -187,6 +202,11 @@ int main( int, char *[] )
    Bu::MemBuf mbStore;
    SomethingCache c( mbStore );
+    {
+        SubSomethingA a("Test", 1);
+        a.sayHi();
+    }
    SomethingPtr ptr;
    if( time(NULL)%2 )
        ptr = c.insert( new SubSomethingA("Hello", 55) ).cast<Something>();
@@ -205,8 +225,13 @@ int main( int, char *[] )
    SomethingPtr p2 = c.insert( new SubSomethingA("new test", 123) ).cast<Something>();
    id = p2.getKey();
+    Bu::println("p2 %1: %2").arg( id ).arg( c.has( id ) );
    p2.unbind();
+    Bu::println("p2 %1: %2").arg( id ).arg( c.has( id ) );
    c.erase( id );
+    Bu::println("p2 %1: %2").arg( id ).arg( c.has( id ) );
+    Bu::println("Program listing over, leaving main scope.");
    return 0;
 }
diff --git a/src/tests/myriad.cpp b/src/tests/myriad.cpp
new file mode 100644
index 0000000..ee4eac4
--- /dev/null
+++ b/src/tests/myriad.cpp
@@ -0,0 +1,23 @@
+#include <bu/myriad.h>
+#include <bu/myriadstream.h>
+#include <bu/string.h>
+#include <bu/sio.h>
+#include <bu/file.h>
+int main( int , char *[] )
+{
+    Bu::File fMyriad("test.myr", Bu::File::WriteNew|Bu::File::Read );
+    Bu::Myriad m( fMyriad, 32 );
+    Bu::MyriadStream ms = m.create( Bu::Myriad::ReadWrite );
+    ms.setSize( 150 );
+    ms.setPos( 145 );
+    char stuff[10];
+    int32_t iRead = ms.read( stuff, 10 );
+    Bu::println("Tried to read 10, expect 5, got %1").arg( iRead );
+    return 0;
+}
diff --git a/src/tests/myriadfs.cpp b/src/tests/myriadfs.cpp
index 1266e4b..29ac3d9 100644
--- a/src/tests/myriadfs.cpp
+++ b/src/tests/myriadfs.cpp
@@ -9,7 +9,7 @@ using namespace Bu;
 int main()
 {
 //  Bu::MemBuf mb;
-    Bu::File mb("store.myr", File::Read|File::Write|File::Create );
+    Bu::File mb("store.mfs", File::Read|File::Write|File::Create );
    Bu::MyriadFs mfs( mb, 512 );
    sio << "Creating dirs..." << sio.nl;
diff --git a/src/tools/myriad.cpp b/src/tools/myriad.cpp
index ccf3d3b..0dd9840 100644
--- a/src/tools/myriad.cpp
+++ b/src/tools/myriad.cpp
@@ -20,6 +20,7 @@ enum Mode
    modeCreate,
    modeInfo,
    modeStreamNew,
+    modeStreamErase,
    modeStreamDump,
    modeStreamPut,
    modeStreamGet,
@@ -44,6 +45,8 @@ public:
                "Display some info about a Myriad file." );
        addOption( eMode, 'n', "new",
                "Create a new sub-stream in a Myriad file.");
+        addOption( eMode, 'e', "erase",
+                "Erase sub-stream in a Myriad file.");
        addOption( eMode, 'd', "dump",
                "Display a hexdump of a stream from a Myriad file.");
        addOption( eMode, "get",
@@ -67,6 +70,7 @@ public:
        setOverride( "create", modeCreate );
        setOverride( "info", modeInfo );
        setOverride( "new", modeStreamNew );
+        setOverride( "erase", modeStreamErase );
        setOverride( "dump", modeStreamDump );
        setOverride( "put", modeStreamPut );
        setOverride( "get", modeStreamGet );
@@ -90,6 +94,49 @@ Bu::Formatter &operator>>( Bu::Formatter &f, Mode & /*e*/ )
    return f;
 }
+void printMap( const Bu::BitString &bs )
+{
+    for( int j = 0; j < bs.getSize(); j++ )
+    {
+        if( j>0 && (j%50) == 0 )
+            Bu::println("");
+        if( bs.getBit( j ) )
+            Bu::print("#");
+        else
+            Bu::print("-");
+    }
+    Bu::println("\n");
+}
+void printMap( const Bu::Array<int32_t> &bm )
+{
+    int iBigest = 0;
+    for( int j = 0; j < bm.getSize(); j++ )
+    {
+        if( iBigest < bm[j] )
+            iBigest = bm[j];
+    }
+    int iWidth = Bu::String("%1").arg( iBigest ).end().getSize();
+    Bu::String sEmpty;
+    for( int j = 0; j < iWidth; j++ )
+    {
+        sEmpty += '-';
+    }
+    int iBreakAt = 60/(iWidth+1);
+    for( int j = 0; j < bm.getSize(); j++ )
+    {
+        if( j>0 && (j%iBreakAt) == 0 )
+            Bu::println("");
+        if( bm[j] < 0 )
+            Bu::print("%1 ").arg( sEmpty, Bu::Fmt(2).right().fill(' '));
+        else
+            Bu::print("%1 ").arg( bm[j], Bu::Fmt(2).right().fill(' '));
+        
+    }
+    Bu::println("\n");
+}
 int main( int argc, char *argv[] )
 {
    Options opts( argc, argv );
@@ -121,14 +168,14 @@ int main( int argc, char *argv[] )
                Myriad m( fIn );
                sio << "Myriad info:" << sio.nl
                    << "  Block size:   " << m.getBlockSize() << sio.nl
-                    << "  Block count:  " << m.getNumBlocks() << sio.nl
+                    << "  Block count:  " << m.getTotalBlocks() << sio.nl
-                    << "  Blocks used:  " << m.getNumUsedBlocks() << " ("
+                    << "  Blocks used:  " << m.getUsedBlocks() << " ("
-                    << m.getNumUsedBlocks()*100/m.getNumBlocks() << "%)"
+                    << m.getUsedBlocks()*100/m.getTotalBlocks() << "%)"
                    << sio.nl
-                    << "  Stream count: " << m.getNumStreams() << sio.nl
+                    << "  Stream count: " << m.getTotalStreams() << sio.nl
                    << "  Used space:   " << m.getTotalUsedBytes() << sio.nl
                    << "  Unused space: " << m.getTotalUnusedBytes() << sio.nl
-                    << "  % of files:   " << (double)(m.getNumBlocks()*m.getBlockSize())/(double)(m.getTotalUsedBytes() + m.getTotalUnusedBytes( 4096 ))*100.0 << sio.nl;
+                    << "  % of files:   " << (double)(m.getTotalBlocks()*m.getBlockSize())/(double)(m.getTotalUsedBytes() + m.getTotalUnusedBytes( 4096 ))*100.0 << sio.nl;
 /*              Bu::Array<int> aStreams = m.getStreamIds();
                sio << "  Stream info:" << sio.nl;
                for( Bu::Array<int>::iterator i = aStreams.begin(); i; i++ )
@@ -149,7 +196,23 @@ int main( int argc, char *argv[] )
            {
                File fOut( opts.sFile, File::Write|File::Read );
                Myriad m( fOut );
-                m.createStream( opts.iPreallocate );
+                m.create( Bu::Myriad::WriteNew, opts.iPreallocate );
+            }
+            break;
+        case modeStreamErase:
+            if( !opts.sFile.isSet() )
+            {
+                sio << "Please specify a file manipulate." << sio.nl;
+                return 0;
+            }
+            else
+            {
+                File fOut( opts.sFile, File::Write|File::Read );
+                Myriad m( fOut );
+                m.erase( opts.iStream );
+                printMap( m.buildBlockUseMap() );
+                printMap( m.buildBlockMap() );
            }
            break;
@@ -163,7 +226,7 @@ int main( int argc, char *argv[] )
            {
                File fOut( opts.sFile, File::Read );
                Myriad m( fOut );
-                MyriadStream s = m.openStream( opts.iStream );
+                MyriadStream s = m.open( opts.iStream, Bu::Myriad::Read );
                sio << "Stream " << opts.iStream << ":" << sio.nl;
                char buf[8];
                int iPos = 0;
@@ -210,8 +273,8 @@ int main( int argc, char *argv[] )
            {
                File fOut( opts.sFile, File::Write|File::Read );
                Myriad m( fOut );
-                MyriadStream sOut = m.openStream(
+                MyriadStream sOut = m.create(
-                    m.createStream( opts.iPreallocate )
+                    Bu::Myriad::WriteNew, opts.iPreallocate
                    );
                File fIn( opts.sSrc, File::Read );
                char buf[1024];
@@ -236,7 +299,7 @@ int main( int argc, char *argv[] )
            {
                File fIn( opts.sFile, File::Write|File::Read );
                Myriad m( fIn );
-                MyriadStream sIn = m.openStream( opts.iStream );
+                MyriadStream sIn = m.open( opts.iStream, Bu::Myriad::Read );
                File fOut( opts.sDst, File::Write|File::Create|File::Truncate );
                char buf[1024];
                while( !sIn.isEos() )
@@ -255,17 +318,8 @@ int main( int argc, char *argv[] )
            {
                File fIn( opts.sFile, File::Write|File::Read );
                Myriad m( fIn );
-                Bu::BitString bs = m.getBlocksUsed();
+                printMap( m.buildBlockUseMap() );
-                for( int j = 0; j < bs.getSize(); j++ )
+                printMap( m.buildBlockMap() );
-                {
-                    if( j>0 && (j%50) == 0 )
-                        Bu::println("");
-                    if( bs.getBit( j ) )
-                        Bu::print("#");
-                    else
-                        Bu::print("-");
-                }
-                Bu::println("\n");
            }
            break;
@@ -277,4 +331,3 @@ int main( int argc, char *argv[] )
    return 0;
 }
diff --git a/src/unit/myriad.unit b/src/unit/myriad.unit
index 24d3116..f7bea97 100644
--- a/src/unit/myriad.unit
+++ b/src/unit/myriad.unit
@@ -109,7 +109,7 @@ suite Myriad
        File fMyriad = tempFile( sFileName );
        Myriad m( fMyriad, 32 );
-        MyriadStream ms = m.openStream( m.createStream() );
+        MyriadStream ms = m.create( Myriad::ReadWrite );
        ms.setSize( 150 );
        ms.setPos( 145 );
        char stuff[10];
@@ -163,7 +163,7 @@ suite Myriad
        if( iSize < 8 || iSize > 1024 )
            throw ExceptionBase("Read bad data, %d", iSize );
        char *buf = new char[iSize-8];
-        if( s.read( buf, iSize-8 ) < (size_t)iSize-8 )
+        if( s.read( buf, iSize-8 ) < (Bu::size)iSize-8 )
        {
            delete[] buf;
            throw ExceptionBase("Block failed verify (insuffient block data).");
@@ -197,13 +197,12 @@ suite Myriad
        String sFileName("myriad-XXXXXXX");
        File fMyriad = tempFile( sFileName );
-        Myriad m( fMyriad );
+        Myriad m( fMyriad, 64 );
-        m.initialize( 64 );
        Array<int> aStreams;
        for( int j = 0; j < 5; j++ )
        {
-            aStreams.append( m.createStream() );
+            aStreams.append( m.create( Bu::Myriad::Read ).getId() );
        }
        srandom( 512 );
@@ -213,7 +212,7 @@ suite Myriad
            switch( random()%5 )
            {
                case 0:
-                    aStreams.append( m.createStream() );
+                    aStreams.append( m.create( Bu::Myriad::Read ).getId() );
                    break;
                case 1:
@@ -221,10 +220,10 @@ suite Myriad
                    {
                        int iStream = random()%aStreams.getSize();
                        {
-                            MyriadStream ms = m.openStream( aStreams[iStream] );
+                            MyriadStream ms = m.open( aStreams[iStream],  Myriad::Read );
                            verifyStream( ms );
                        }
-                        m.deleteStream( aStreams[iStream] );
+                        m.erase( aStreams[iStream] );
                        Array<int>::iterator i = aStreams.begin();
                        for( int k = 0; k < iStream; k++ )
                            i++;
@@ -235,11 +234,13 @@ suite Myriad
                default:
                    if( aStreams.getSize() == 0 )
                    {
-                        aStreams.append( m.createStream() );
+                        aStreams.append(
+                            m.create( Bu::Myriad::Read ).getId()
+                            );
                    }
                    {
                        int iStream = random()%aStreams.getSize();
-                        MyriadStream ms = m.openStream( aStreams[iStream] );
+                        MyriadStream ms = m.open( aStreams[iStream], Myriad::ReadWrite );
                        addBlock( ms );
                        verifyStream( ms );
                    }
@@ -249,7 +250,7 @@ suite Myriad
        for( Array<int>::iterator i = aStreams.begin(); i; i++ )
        {
-            MyriadStream ms = m.openStream( *i );
+            MyriadStream ms = m.open( *i, Myriad::Read );
            verifyStream( ms );
        }
    }
@@ -259,14 +260,13 @@ suite Myriad
        String sFileName("myriad-XXXXXXX");
        File fMyriad = tempFile( sFileName );
-        Myriad m( fMyriad );
+        Myriad m( fMyriad, 128 );
-        m.initialize( 128 );
        Array<int> aStream;
        for( int j = 0; j < 5; j++ )
        {
-            aStream.append( m.createStream() );
+            aStream.append( m.create( Bu::Myriad::Read ).getId() );
        }
        
        srandom( 1024 );
@@ -276,7 +276,7 @@ suite Myriad
        {
            for( Array<int>::iterator i = aStream.begin(); i; i++ )
            {
-                MyriadStream ms = m.openStream( *i );
+                MyriadStream ms = m.open( *i, Myriad::ReadWrite );
                addBlock( ms, false );
                ms.setSize( ms.tell() );
                unitTest( ms.read( &b, 1 ) == 0 );
@@ -301,7 +301,7 @@ suite Myriad
            for( int j = 0; j < 5; j++ )
            {
-                aStream.append( m.createStream() );
+                aStream.append( m.create( Bu::Myriad::Read ).getId() );
                incProgress();
            }
        }
@@ -315,7 +315,7 @@ suite Myriad
            Myriad m( fMyriad );
            for( Array<int>::iterator i = aStream.begin(); i; i++ )
            {
-                MyriadStream ms = m.openStream( *i );
+                MyriadStream ms = m.open( *i, Myriad::ReadWrite );
                addBlock( ms, false );
                ms.setSize( ms.tell() );
                unitTest( ms.read( &b, 1 ) == 0 );
@@ -342,17 +342,17 @@ suite Myriad
            for( int j = 0; j < 15; j++ )
            {
-                int iStream = m.createStream();
+                MyriadStream ms = m.create( Myriad::Write );
+                int iStream = ms.getId();
                aStream.append( iStream );
                VerifyObject vo( random()%1024 );
                {
-                    MyriadStream ms = m.openStream( iStream );
                    Archive ar( ms, Archive::save );
                    ar << vo;
                    unitTest( ms.tell() == vo.getBytesWritten() );
                    ms.setSize( ms.tell() );
                }
-                unitTest( m.getStreamSize( iStream ) == vo.getBytesWritten() );
+                unitTest( m.getSize( iStream ) == vo.getBytesWritten() );
                incProgress();
            }
        }
@@ -365,18 +365,18 @@ suite Myriad
            {
                VerifyObject vo( random()%1024 );
                {
-                    MyriadStream ms = m.openStream( *i );
+                    MyriadStream ms = m.open( *i, Myriad::Read );
                    Archive ar( ms, Archive::load );
                    ar >> vo;
                }
                {
-                    MyriadStream ms = m.openStream( *i );
+                    MyriadStream ms = m.open( *i, Myriad::WriteNew );
                    Archive ar( ms, Archive::save );
                    ar << vo;
                    unitTest( ms.tell() == vo.getBytesWritten() );
                    ms.setSize( ms.tell() );
                }
-                unitTest( m.getStreamSize( *i ) == vo.getBytesWritten() );
+                unitTest( m.getSize( *i ) == vo.getBytesWritten() );
                incProgress();
            }
        }
diff --git a/src/unstable/bitstring.cpp b/src/unstable/bitstring.cpp
index 21c1316..b80c073 100644
--- a/src/unstable/bitstring.cpp
+++ b/src/unstable/bitstring.cpp
@@ -209,7 +209,7 @@ void Bu::BitString::flipBit( long iBit )
    caData[iBit/8] ^= (1<<(iBit%8));
 }
-bool Bu::BitString::getBit( long iBit )
+bool Bu::BitString::getBit( long iBit ) const
 {
    if( iBit >= iBits || iBit < 0 ) return false;
    if( (caData[iBit/8] & (1<<(iBit%8))) == 0 )
@@ -224,7 +224,7 @@ long Bu::BitString::getBitLength()
    return iBits;
 }
-long Bu::BitString::getSize()
+long Bu::BitString::getSize() const
 {
    return iBits;
 }
@@ -311,6 +311,14 @@ void Bu::BitString::clear()
    }
 }
+void Bu::BitString::fill()
+{
+    if( caData != NULL )
+    {
+        memset( caData, 0xff, iBytes );
+    }
+}
 bool Bu::BitString::setBitLength( long iLength, bool bClear )
 {
    return setSize( iLength, bClear );
diff --git a/src/unstable/bitstring.h b/src/unstable/bitstring.h
index afc22fb..70ba822 100644
--- a/src/unstable/bitstring.h
+++ b/src/unstable/bitstring.h
@@ -88,7 +88,7 @@ namespace Bu
         *@param iBit The index of the bit to test.
         *@returns True for a 1, false for a 0.
         */
-        bool getBit( long iBit );
+        bool getBit( long iBit ) const;
        /**
         * Inverts the entire BitString, in effect this calls flipBit on every
@@ -106,7 +106,7 @@ namespace Bu
        DEPRECATED
        long getBitLength();
-        long getSize();
+        long getSize() const;
        /**
         * Sets the entire BitString to zeros, but it does it very quickly.
@@ -115,6 +115,12 @@ namespace Bu
        void clear();
        /**
+         * Sets the entire BitString to ones, but it does it very quickly.
+         * This operation runs in O(N).
+         */
+        void fill();
+        /**
         * Gets another BitString that is autonomous of the current one
         * (contains a copy of the memory, not a pointer) and contains a subset
         * of the data in the current BitString.  This is an inclusive
diff --git a/src/unstable/cachebase.h b/src/unstable/cachebase.h
index ec73ede..830f5fe 100644
--- a/src/unstable/cachebase.h
+++ b/src/unstable/cachebase.h
@@ -32,11 +32,15 @@ namespace Bu
            bDeleted( false ),
            pObject( pObject )
        {
+            //Bu::println("CacheEntry::CacheEntry: registering pObject (0x%1)").
+            //    arg( reinterpret_cast<ptrdiff_t>(pObject), Bu::Fmt::hex() );
        }
        virtual ~CacheEntry()
        {
            mEntry.lock();
+            //Bu::println("CacheEntry::~CacheEntry: deleting pObject (0x%1)").
+            //    arg( reinterpret_cast<ptrdiff_t>(pObject), Bu::Fmt::hex() );
            delete pObject;
            mEntry.unlock();
        }
@@ -497,7 +501,7 @@ namespace Bu
                if( pEnt->iRefCount == 0 )
                {
                    pEnt->mEntry.unlock();
-                    delete pEnt->pObject;
+                    //delete pEnt->pObject;
                    delete pEnt;
                }
                else
@@ -529,7 +533,7 @@ namespace Bu
                    pEnt->mEntry.unlock();
                    throw Bu::ExceptionBase( Bu::String("Cache entry %1 cannot be erased, there are %2 active references.").arg( key ).arg( iCount ).end().getStr() );
                }
-                delete pEnt->pObject;
+                //delete pEnt->pObject;
                delete pEnt;
                hCacheEntry.erase( key );
            }
@@ -559,7 +563,7 @@ namespace Bu
        {
            if( pEnt->isReadyForCleanup() )
            {
-                delete pEnt->pObject;
+                //delete pEnt->pObject;
                delete pEnt;
            }
        }
diff --git a/src/unstable/myriadcache.h b/src/unstable/myriadcache.h
index 24002b0..3629005 100644
--- a/src/unstable/myriadcache.h
+++ b/src/unstable/myriadcache.h
@@ -28,7 +28,9 @@ namespace Bu
            try
            {
                Bu::ReadWriteMutex::ReadLocker l( rwStore );
-                Bu::MyriadStream ms = mStore.openStream( 1 );
+                Bu::MyriadStream ms = mStore.open(
+                    1, Bu::Myriad::Read
+                    );
                Bu::Archive ar( ms, Bu::Archive::load );
                uint8_t uVer;
                ar >> uVer;
@@ -41,10 +43,15 @@ namespace Bu
            }
            catch(...)
            {
-                if( mStore.createStreamWithId( 1 ) != 1 )
+                try
+                {
+                    mStore.open( 1, Bu::Myriad::Create|Bu::Myriad::ReadWrite );
+                    _sync();
+                }
+                catch(...)
+                {
                    throw Bu::ExceptionBase("Error creating index stream.");
+                }
-                _sync();
            }
        }
@@ -78,7 +85,10 @@ namespace Bu
        virtual void _create( const obtype *o )
        {
            Bu::ReadWriteMutex::WriteLocker wl( rwStore );
-            hIndex.insert( o->getKey(), mStore.createStream() );
+            {
+                Bu::Myriad::StreamId id = mStore.allocate();
+                hIndex.insert( o->getKey(), id );
+            }
            _save( o );
            bStructureChanged = true;
@@ -87,7 +97,7 @@ namespace Bu
        virtual void _erase( const keytype &k )
        {
            Bu::ReadWriteMutex::WriteLocker wl( rwStore );
-            mStore.deleteStream( hIndex.get( k ) );
+            mStore.erase( hIndex.get( k ) );
            hIndex.erase( k );
            bStructureChanged = true;
@@ -98,13 +108,13 @@ namespace Bu
            const keytype &k
            )
        {
-            Bu::MyriadStream ms = mStore.openStream( hIndex.get( k ) );
+            Bu::MyriadStream ms = mStore.open( hIndex.get( k ), Bu::Myriad::Read );
            return _cacheObjectLoad<keytype, obtype>( initObj, k, ms );
        }
        virtual void _save( const obtype *o )
        {
-            Bu::MyriadStream ms = mStore.openStream( hIndex.get( o->getKey() ) );
+            Bu::MyriadStream ms = mStore.open( hIndex.get( o->getKey() ), Bu::Myriad::WriteNew );
            _cacheObjectSave( ms, o );
            ms.setSize( ms.tell() );
            
@@ -117,7 +127,7 @@ namespace Bu
            if( !bStructureChanged )
                return;
-            Bu::MyriadStream ms = mStore.openStream( 1 );
+            Bu::MyriadStream ms = mStore.open( 1, Bu::Myriad::WriteNew );
            Bu::Archive ar( ms, Bu::Archive::save );
            ar << (uint8_t)0 << hIndex;
            ar.close();
diff --git a/src/unstable/myriadfs.cpp b/src/unstable/myriadfs.cpp
index b24997a..f748a53 100644
--- a/src/unstable/myriadfs.cpp
+++ b/src/unstable/myriadfs.cpp
@@ -8,6 +8,7 @@
 #include "bu/config.h"
 #include "bu/myriadfs.h"
 #include "bu/myriadstream.h"
+#include "bu/mutexlocker.h"
 #include <string.h>
 #include <unistd.h>
@@ -32,10 +33,10 @@ Bu::MyriadFs::MyriadFs( Bu::Stream &rStore, int iBlockSize ) :
    iGroup = getgid();
 #endif
-    if( mStore.hasStream( 1 ) )
+    if( mStore.exists( 1 ) )
    {
        // Check to see if this is a MyriadFs stream.
-        Bu::MyriadStream ms = mStore.openStream( 1 );
+        Bu::MyriadStream ms = mStore.open( 1, Bu::Myriad::Read );
        char sMagic[4];
        if( ms.read( sMagic, 4 ) < 4 )
            throw MyriadFsException("The provided stream does not appear to be "
@@ -62,8 +63,8 @@ Bu::MyriadFs::MyriadFs( Bu::Stream &rStore, int iBlockSize ) :
    {
        // Create initial header stream
        {
-            mStore.createStream( 1 );
+            Bu::MyriadStream ms = mStore.open(
-            Bu::MyriadStream ms = mStore.openStream( 1 );
+                1, Bu::Myriad::WriteNew|Bu::Myriad::Exclusive );
            ms.write( Myriad_Fs_MAGIC_CODE, 4 );
            int8_t iVer = 1;
            int32_t iTmp = 1;
@@ -77,8 +78,8 @@ Bu::MyriadFs::MyriadFs( Bu::Stream &rStore, int iBlockSize ) :
        // Create initial inode stream, with one root node.
        {
-            mStore.createStream( 2 );
+            Bu::MyriadStream ms = mStore.open(
-            Bu::MyriadStream ms = mStore.openStream( 2 );
+                2, Bu::Myriad::WriteNew|Bu::Myriad::Exclusive );
            RawStat rs;
            rs.iNode = 0;
            rs.iUser = iUser;
@@ -92,8 +93,8 @@ Bu::MyriadFs::MyriadFs( Bu::Stream &rStore, int iBlockSize ) :
        // Create inode 0's storage stream.
        {
-            mStore.createStream( 3 );
+            Bu::MyriadStream ms = mStore.open(
-            Bu::MyriadStream ms = mStore.openStream( 3 );
+                3, Bu::Myriad::WriteNew|Bu::Myriad::Exclusive );
            int32_t iTmp32 = 0;
            ms.write( &iTmp32, 4 );     // iChildCount
        }
@@ -107,15 +108,17 @@ Bu::MyriadFs::~MyriadFs()
 void Bu::MyriadFs::stat( const Bu::String &sPath, Bu::MyriadFs::Stat &rBuf )
 {
+    Bu::MutexLocker lLock( mAccess );
    int32_t iParent;
    int32_t iNode = lookupInode( sPath, iParent );
-    Bu::MyriadStream is = mStore.openStream( 2 );
+    Bu::MyriadStream is = mStore.open( 2, Bu::Myriad::Read );
    stat( iNode, rBuf, is );
 }
 Bu::MyriadStream Bu::MyriadFs::open( const Bu::String &sPath, int iMode,
        uint16_t uPerms )
 {
+    Bu::MutexLocker lLock( mAccess );
    int32_t iParent = -1;
    int32_t iNode;
    try
@@ -164,6 +167,7 @@ void Bu::MyriadFs::create( const Bu::String &sPath, uint16_t iPerms,
 void Bu::MyriadFs::create( const Bu::String &sPath, uint16_t iPerms,
        uint32_t uSpecial )
 {
+    Bu::MutexLocker lLock( mAccess );
    int32_t iParent = -1;
 //    int32_t iNode;
    try
@@ -200,6 +204,7 @@ void Bu::MyriadFs::mkDir( const Bu::String &sPath, uint16_t iPerms )
 void Bu::MyriadFs::mkSymLink( const Bu::String &sTarget,
        const Bu::String &sPath )
 {
+    Bu::MutexLocker lLock( mAccess );
    int32_t iParent = -1;
    int32_t iNode;
    try
@@ -232,6 +237,7 @@ void Bu::MyriadFs::mkSymLink( const Bu::String &sTarget,
 void Bu::MyriadFs::mkHardLink( const Bu::String &sTarget,
        const Bu::String &sPath )
 {
+    Bu::MutexLocker lLock( mAccess );
    int32_t iParent = -1;
    int32_t iNode;
    
@@ -257,7 +263,7 @@ void Bu::MyriadFs::mkHardLink( const Bu::String &sTarget,
 //        sio << "End filename: " << sName << sio.nl;
 //        sio << "Parent inode: " << iParent << sio.nl;
        addToDir( iParent, iNode, sName );
-        MyriadStream is = mStore.openStream( 2 );
+        MyriadStream is = mStore.open( 2, Bu::Myriad::ReadWrite );
        RawStat rs;
        readInode( iNode, rs, is );
        rs.iLinks++;
@@ -267,6 +273,7 @@ void Bu::MyriadFs::mkHardLink( const Bu::String &sTarget,
 Bu::String Bu::MyriadFs::readSymLink( const Bu::String &sPath )
 {
+    Bu::MutexLocker lLock( mAccess );
    int32_t iParent = -1;
    int32_t iNode;
    iNode = lookupInode( sPath, iParent );
@@ -279,6 +286,7 @@ Bu::String Bu::MyriadFs::readSymLink( const Bu::String &sPath )
 Bu::MyriadFs::Dir Bu::MyriadFs::readDir( const Bu::String &sPath )
 {
+    Bu::MutexLocker lLock( mAccess );
    int32_t iParent = -1;
    int32_t iNode = lookupInode( sPath, iParent );
    return readDir( iNode );
@@ -287,6 +295,7 @@ Bu::MyriadFs::Dir Bu::MyriadFs::readDir( const Bu::String &sPath )
 void Bu::MyriadFs::setTimes( const Bu::String &sPath, int64_t iATime,
        int64_t iMTime )
 {
+    Bu::MutexLocker lLock( mAccess );
    int32_t iParent = -1;
    int32_t iNode;
@@ -297,6 +306,7 @@ void Bu::MyriadFs::setTimes( const Bu::String &sPath, int64_t iATime,
 void Bu::MyriadFs::unlink( const Bu::String &sPath )
 {
+    Bu::MutexLocker lLock( mAccess );
    int32_t iParent = -1;
 //  int32_t iNode;
@@ -314,7 +324,9 @@ void Bu::MyriadFs::unlink( const Bu::String &sPath )
            readInode( (*i).iNode, rs );
            if( (rs.uPerms&typeMask) == typeDir )
            {
-                MyriadStream msDir = mStore.openStream( rs.uStreamIndex );
+                MyriadStream msDir = mStore.open(
+                    rs.uStreamIndex, Bu::Myriad::Read
+                    );
                int32_t iCount;
                msDir.read( &iCount, 4 );
                if( iCount > 0 )
@@ -350,6 +362,7 @@ void Bu::MyriadFs::unlink( const Bu::String &sPath )
 void Bu::MyriadFs::setFileSize( const Bu::String &sPath, int32_t iSize )
 {
+    Bu::MutexLocker lLock( mAccess );
    int32_t iParent = -1;
    int32_t iNode;
    iNode = lookupInode( sPath, iParent );
@@ -359,6 +372,7 @@ void Bu::MyriadFs::setFileSize( const Bu::String &sPath, int32_t iSize )
 void Bu::MyriadFs::rename( const Bu::String &sFrom, const Bu::String &sTo )
 {
+    Bu::MutexLocker lLock( mAccess );
    mkHardLink( sFrom, sTo );
    unlink( sFrom );
 }
@@ -449,7 +463,7 @@ void Bu::MyriadFs::readInode( int32_t iNode, RawStat &rs, MyriadStream &rIs )
 void Bu::MyriadFs::readInode( int32_t iNode, RawStat &rs )
 {
-    MyriadStream ms = mStore.openStream( 2 );
+    MyriadStream ms = mStore.open( 2, Bu::Myriad::Read );
    readInode( iNode, rs, ms );
 }
@@ -464,7 +478,7 @@ void Bu::MyriadFs::writeInode( const RawStat &rs,
 void Bu::MyriadFs::writeInode( const RawStat &rs )
 {
-    MyriadStream ms = mStore.openStream( 2 );
+    MyriadStream ms = mStore.open( 2, Bu::Myriad::Write );
    writeInode( rs, ms );
 }
@@ -474,9 +488,9 @@ Bu::MyriadFs::Dir Bu::MyriadFs::readDir( int32_t iNode )
    int32_t iNumChildren = 0;
    ms.read( &iNumChildren, 4 );
    
-    Bu::MyriadStream is = mStore.openStream( 2 );
+    Bu::MyriadStream is = mStore.open( 2, Bu::Myriad::Read );
    Dir lDir;
-    sio << "Reading dir " << iNode << ", " << iNumChildren << " entries:" << sio.nl;
+    // sio << "Reading dir " << iNode << ", " << iNumChildren << " entries:" << sio.nl;
    for( int32_t j = 0; j < iNumChildren; j++ )
    {
        int32_t iChildNode = 0;
@@ -485,7 +499,6 @@ Bu::MyriadFs::Dir Bu::MyriadFs::readDir( int32_t iNode )
            throw Bu::MyriadFsException(
                "Failed to read iChildNode from directory.");
        }
-        Bu::println("  - iNode = %1").arg( iChildNode );
        Stat s;
        stat( iChildNode, s, is );
        uint8_t uLen;
@@ -494,14 +507,12 @@ Bu::MyriadFs::Dir Bu::MyriadFs::readDir( int32_t iNode )
            throw Bu::MyriadFsException(
                "Failed to read uLen from directory.");
        }
-        Bu::println("  - Name bytes = %1").arg( uLen );
        s.sName.setSize( uLen );
        if( ms.read( s.sName.getStr(), uLen ) < uLen )
        {
            throw Bu::MyriadFsException(
                "Failed to read sName from directory.");
        }
-        Bu::println("  - Name = \"%1\"").arg( s.sName );
        lDir.append( s );
 //      sio << "    " << s.sName << sio.nl;
@@ -519,9 +530,7 @@ Bu::MyriadStream Bu::MyriadFs::openByInode( int32_t iNode )
        case typeDir:
        case typeSymLink:
        case typeRegFile:
-            Bu::println("Opening stream by iNode=%1, myriad stream=%2")
+            return mStore.open( rs.uStreamIndex, Bu::Myriad::ReadWrite );
-                .arg( iNode ).arg( rs.uStreamIndex );
-            return mStore.openStream( rs.uStreamIndex );
        default:
            throw Bu::MyriadFsException(
@@ -575,17 +584,17 @@ int32_t Bu::MyriadFs::allocInode( uint16_t uPerms, uint32_t uSpecial )
            {
                case typeRegFile:
                case typeSymLink:
-                    rs.uStreamIndex = mStore.createStream();
+                    rs.uStreamIndex = mStore.allocate();
                    break;
                
                case typeDir:
-                    rs.uStreamIndex = mStore.createStream();
 //                    sio << "Creating directory node, storage: "
 //                        << rs.uStreamIndex << sio.nl;
                    {
-                        Bu::MyriadStream msDir = mStore.openStream(
+                        Bu::MyriadStream msDir = mStore.create(
-                            rs.uStreamIndex
+                            Bu::Myriad::Write
                            );
+                        rs.uStreamIndex = msDir.getId();
                        uint32_t uSize = 0;
                        msDir.write( &uSize, 4 );
                    }
@@ -631,7 +640,7 @@ void Bu::MyriadFs::stat( int32_t iNode, Stat &rBuf, MyriadStream &rIs )
    {
        case typeRegFile:
        case typeSymLink:
-            rBuf.iSize = mStore.getStreamSize( rs.uStreamIndex );
+            rBuf.iSize = mStore.getSize( rs.uStreamIndex );
            break;
        case typeChrDev:
@@ -647,7 +656,7 @@ void Bu::MyriadFs::stat( int32_t iNode, Stat &rBuf, MyriadStream &rIs )
 void Bu::MyriadFs::writeHeader()
 {
-    Bu::MyriadStream ms = mStore.openStream( 1 );
+    Bu::MyriadStream ms = mStore.open( 1, Bu::Myriad::Write );
    ms.write( Myriad_Fs_MAGIC_CODE, 4 );
    int8_t iVer = 1;
    int32_t iNumNodes = hNodeIndex.getSize();
@@ -668,7 +677,7 @@ void Bu::MyriadFs::writeHeader()
 void Bu::MyriadFs::setTimes( int32_t iNode, int64_t iATime, int64_t iMTime )
 {
    RawStat rs;
-    Bu::MyriadStream is = mStore.openStream( 2 );
+    Bu::MyriadStream is = mStore.open( 2, Bu::Myriad::ReadWrite );
    readInode( iNode, rs, is );
    rs.iATime = iATime;
@@ -681,18 +690,21 @@ void Bu::MyriadFs::destroyNode( int32_t iNode )
    if( iNode == 0 )
        throw Bu::MyriadFsException("You cannot destroy the root.");
-    Bu::MyriadStream is = mStore.openStream( 2 );
+    uint32_t iPosition;
+    RawStat rsOld;
+    Bu::MyriadStream is = mStore.open( 2, Bu::Myriad::ReadWrite );
    // This will be overwritten with the last node
-    uint32_t iPosition = hNodeIndex.get( iNode );
+    iPosition = hNodeIndex.get( iNode );
-    RawStat rsOld;
    readInode( iNode, rsOld, is );
+    
    switch( (rsOld.uPerms&typeMask) )
    {
        case typeRegFile:
        case typeDir:
        case typeSymLink:
-            mStore.deleteStream( rsOld.uStreamIndex );
+            mStore.erase( rsOld.uStreamIndex );
            break;
    }
diff --git a/src/unstable/myriadfs.h b/src/unstable/myriadfs.h
index ff14292..e3008bc 100644
--- a/src/unstable/myriadfs.h
+++ b/src/unstable/myriadfs.h
@@ -11,7 +11,7 @@
 #include <sys/types.h>
 #include "bu/myriad.h"
-#include "bu/readwritemutex.h"
+#include "bu/debugmutex.h"
 namespace Bu
 {
@@ -108,7 +108,7 @@ namespace Bu
            Truncate    = 0x08, ///< Truncate file if it does exist
            Append      = 0x10, ///< Always append on every write
            NonBlock    = 0x20, ///< Open file in non-blocking mode
-            Exclusive   = 0x44, ///< Create file, if it exists then fail
+            Exclusive   = 0x40, ///< Create file, if it exists then fail
            // Helpful mixes
            ReadWrite   = 0x03, ///< Open for reading and writing
@@ -172,7 +172,13 @@ namespace Bu
        typedef Bu::Hash<int32_t, int32_t> NodeIndex;
    private:
+        /**
+         * Lookup inode.
+         */
        int32_t lookupInode( const Bu::String &sPath, int32_t &iParent );
+        /**
+         * Lookup inode.
+         */
        int32_t lookupInode( Bu::String::const_iterator iStart,
                int32_t iNode, int32_t &iParent );
        void readInode( int32_t iNode, RawStat &rs, MyriadStream &rIs );
@@ -190,12 +196,12 @@ namespace Bu
        void setTimes( int32_t iNode, int64_t iATime, int64_t iMTime );
        void destroyNode( int32_t iNode );
-        Bu::String filePart( const Bu::String &sPath );
+        static Bu::String filePart( const Bu::String &sPath );
    private:
        Bu::Stream &rStore;
        Bu::Myriad mStore;
-        Bu::ReadWriteMutex mNodeIndex;
+        Bu::DebugMutex mAccess;
        NodeIndex hNodeIndex;
        int32_t iUser;
        int32_t iGroup;