Adding switches for features and starting work on nesting option.