Rockage

WIP, dont merge, Dom internal code review only.
I'll bug it up