more updates - might work with local and remote now -- still a little wonky but it\'s late