Multiview branch, ready for first review