Build out rest of presentation
Clean up rebase from master