Need to go through the bowties and make them 'D' instead, a function, that derives a derived component.... Annoying means I have to go through ALL the dia diagrams as well......