Updated to the end of the first class on 10-9-14