some more work on the Eureka stuff