Updated with class stuff from April 30th, 2014