updated 3/13/2014
updated 3/24/2014
updated 3/24/2014
updated 3/24/2014
updated 3/24/2014
updated 3/24/2014
updated 3/25/2014
Merge pp2 attempt