Starting to shuffle functions over.