Domain conversion to objectify round 1

More objectify conversion. 

Next item on the agenda object relationships.