Started making some of the properties variable