Refactored code and put into modules.  Object.go passes test.