Lots of new techniques... Need some time for Mock and DI to sink...