Topic/phase shift

The bits from #4 not involving utf8...