Changed name for be more X-Ray Spex like.  Moved some things around.  Improved importing.  API, unchanged.