Feature/smoother first install