First commit from consolidated source