Initial commit with proper selection