Added another class to make it fit a MVC way of programming
Added world class