Some work toward offline implementation