Merge pull request #472 from stowellm/ms454

Added Fields object, completed DFM
Fixed scrollview drawing bug that caused data to upload incorrectly