refactor Field Class
Merge branch 'master' into development
refactored Field, intantiation, handling etc
rebuilt after merge