Added the code that we worked on over the weekend