Adding the whole bit in with tests
Adding the whole bit in with tests