updated var names, now using a base_uri for local file resolving