First attempt on correct build without warnings.