add proper namespacing, implement salmon magic envelope