Updated with most of revisions from 1/13/2014 call - still need to change color scheme