2009-04-07 insilmaril more work on screwing up the data structures