Uncommented some of my commented-out-for-test stuff.