Is this the correct thing to be returning?