Generator creation merge

There is an extra radio button that need to be integrated.