making fields private and usable
Merge branch 'develop' into feature-private-fields
Merge branch 'feature-private-fields' into develop