Stayed up late learning about properties and made some modifications to make use of property initialisation.