Merge final talk, closes #23