Now with logging and mocking