Fixed compile errors. Moved thunks into object until solution is found for ambigious references.