Updated objects to support better derivation. Much cleaner than previous revs. Now tim comments.