Did work on the main class