Stage 2 also in there. not tested
Got rid of main