Commit 12/8/14

I hope I did this right?