First commit with basic class container