Rockage

DONT MERGE, wip.  Dom internal code review only.