commit 2 to 10/1/14

not done yet