Getting ready for adverts

Fix and error with the data being transported between classes