Massive improvements to the composer, to the point where it's human-usable!