Issue #6 Some work on related fields