Changed a few class names and added a bit more to Initialisation