Initial re-commit with pointers to timoc repository