Oh dear let's redo all of this real quickly