first commit - converted logic files to classes