My feature works

Hey I'd like to put my feature into master, all the tests are passing