Continued with selectors. Refactored base emitter/signal code