Moved generics back inline
Working through object changes/approximately mid-way (tests OK)
More object rejiggering
More object rejiggering
Use of 'D' slot excised
Class wrangling in process
Class update nearly ready
Class cleanup
bumped up version number
Misc typos
Improved printing
Improved printing
Changed merge function default
Changed merge function default
New class structure, passing tests finally