Split things up some more