a bunch more work on subtemplates.  Almost done server side.