IoC-ish now, and tested