added the first try of using classes