Stage 1 DONE, Stage 2 implement feature control.