Added Stage class and added a bit to Main