Subgenerators final commit, testing pass