Sounds like its exactly what we need, im not sure if my implementation is better tho, the thing about GAE is that the devs would be able to see some actually code and then "just" adapt it.
Nice posting the XML's but my idea deals somewhat with HOW its done, and by storing units this way you can ALSO have tunnels additions to all the other stuff.