Renamed ChannelSet to Output, started marker work