Comment by renton

I thought we moved away from this sort of structure as an improvement?