get rid of lots of passed around references
more work at getting rid of cross-references