Working on getting this class to work