working #1 - breaking up generator commands more appropriately.