------------------------------------------------------------------------------ See http://code.google.com/p/entwine/wiki/TODO ------------------------------------------------------------------------------