11/25 fall2013master updates & test WIP 3