Rockage

WIP, dont merge, Dom internal code review only.
need a default for badge_enums