Added table classes, turned variables into actual variables