Honeycomb

offline - working on public version cleanup