more work on stuff