So, I lied about the data classes being done. Restructured them to the new hierarchy (seperated out Axiom, Endpoint from Assertion, added Element as base class for all ID'd entities). Outline, you're next...