Rebase, implement embiggen and hashCode in tinkering