Maybe we can put this into another module. Ideas?