Broke things out for testing