working on Undefined Envelope
pulling from master
pulling in changes on master
adds envelope catching
merging with master