initial cut at handling xi:include, update TODO