Feature/fields refactor work of 9/9