I'll probably punt on this given the amount of changes I've got to make...
but something we can override would be cool