updated models/logic to reflect new taxonomy system