Almost done just need to sort out the last numbers