Mid-update. Squash.
Full inheritance implementation and observer rework.