Version 2

now caught up with class
10/9/14