Ready for a test build -- all expansion tags have been resolved