Added a basic class system