Stage 2 complete : need to test and debug now