Continued work on main class.