fix it so that we're loading from either local or remote storage