Missed these last commit. Standardizing manager stuff