Added some information object resolution code, still incomplete