ome for bigg2

We won't merge this for a while. Just keeping an eye on the diverging branches.