Merged generator and ESU, closes #75