moved properties to seperate class to share between classes