Nstonehouse/repo split/field mixins