Moved object resolution into one spot to avoid multiple declarations
Added field setting
Removed Test Classes, Formatting etc.