Added code from Fall 2013 semester and present semester, Spring 2014