did some more work
everything appears to work