Actually did what our last commit said to. Added correct files. With Matt and Conor