I wonder if it makes any sense to make it a mixin - so later on when we change it we don't need to do it again