#424 further progress with tokens.
#424 adding collections.