working save point.
working - cleaned things up a bit - needs more refactoring, especially
RDF usage.