Pulled CommandCard References Out of Main