Work to handle vpoll - also in json.

Added some initial support - which needs a rework - for splitting different component types into different collections.