Setup with some timing for a first look at the impact of the changes so
far.
Still much WIP