rough drafts for upgrade and gemtools complete