Working on main class