added some variables and some bare classes