switched uni package from closures to interfaces