Update to remove weird category get().  Added if/then to get into do'type'()