working but needs refactoring
cc
cc
cc
cc
new field config
cc
cc
Merge pull request #2 from core9/develop

Develop