Issue734

Okay, will add back in the other lines from the conflict and uncomment the n values.