I'm going to add a todo on this one. I just tried and screwed it up royally and would like to revisit but don't want to hold up the commit on it