Pulling Caitlin's commits

I also commented out a part of code we probably won't use.