Began Task refactor, trimmed class and moved fromJson to TaskUtil
Merge remote-tracking branch 'origin/start-of-refactor' into start-of-refactor