Possible separation of some concerns...