[MASTER] added a class and some more content to the main method