first pass on #9
more work on the local.xml