Some work on main class