removed commutative diagrams for now; need to fix them