Started adding functions to classes