more work on getting things to play nicely