Few changes. Began work on choosing class at beginning.