Converting to classes, not working yet.