Added table classes, turned variables into actual variables
Merge branches 'master' and 'output'