Just having a think and perhaps I could go the way of middleware instead