more work on this stuff