Estimates two versions

Not done yet - lots of formatting to do. But basic two options are
visible.