Add in old version of toFlow, clean up a little