Splitting out to seperate classes.