Classed

Updated to classes