collector: moving into package.. since will need testing for decoding.