added some in class stuff from 03/24/2014