Work for 11/13/13

Commiting before I go home for the night