Add functions
Merge from fields_feature branch
Add files to ignore list