Initial copy, read-only at the moment, with support for Commands (limited)
Fix parameter labelling.