Added most the classes needed!