Worked on main class a bit.