Mentor Session Update

Adds changes discussed with Tim during 20131016 mentoring session.