Robert

merge in from Robert branch (mostly marble_immigration) stuff