Initial commit based on old fall 2012 notes