Continued developmen on feature wizard