Get star working on modal or stream

Resolves #409