Second commit, added classes