I think this is what needs to happen