Replace method chain w/ delegation to make DI easier