unclusion of util.h, refactor to support remote-to-local, still wip