Major changes, new base types.  Many bug fixes to follow shortly.