Draft of WIP4337
Merge pull request #6 from ericschultz/WIP4337

Draft of WIP4337