almost done writing solutions for this section.

re-ordering is still necessary, as is fixing the final diagram.