make into class