Organizing the mess and welcome commit