Switch functions over to kwargs to make it easier to manage in the future