Rebased spiral emitter type branch ontop of latest master

Rebased this feature branch ontop of latest master. Verified working locally