Once #37 is done, we'll be in a better position to see what this is really going to look like. Maybe we won't do this. Part of epic #35
