switched to all mod classes instead objects
Converted back to object so that proxy can be in same file
Trying implicit convertion instead calling explicit toString
Cleanup