Chague/dev

@jasonzerbe-wf some improvements maybe? 
addressed.