Moved more code into fillStargate