now I need to think of moving this towards what we had in the first attempt