Made classes, need to finish porting to the classes.