Multiview branch, ready for first review

Note to everyone with access to the branch, DO NOT pull this in.