Juan's project from 3/2/16

More March 2