Work on main class