still some more work to do, but hammered out a lot of issues we were having