A bunch more work, potentially working, but need to deploy to test
draft
2019-05-14, Gary Kramlich