First commit with proper config